summaryrefslogtreecommitdiffstats
path: root/src/smtpd/smtpd_check.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-12-12 16:10:49 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-12-12 16:10:49 +0000
commit4bf2526f886d71a067a1004ee5be2b75d0f721f7 (patch)
tree6d07da5e11537220569c748c2af66ae9db991d15 /src/smtpd/smtpd_check.c
parentReleasing progress-linux version 3.9.0-2~progress7.99u1. (diff)
downloadpostfix-4bf2526f886d71a067a1004ee5be2b75d0f721f7.tar.xz
postfix-4bf2526f886d71a067a1004ee5be2b75d0f721f7.zip
Merging upstream version 3.9.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/smtpd/smtpd_check.c')
-rw-r--r--src/smtpd/smtpd_check.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/smtpd/smtpd_check.c b/src/smtpd/smtpd_check.c
index 6aeda74..b63b214 100644
--- a/src/smtpd/smtpd_check.c
+++ b/src/smtpd/smtpd_check.c
@@ -4674,13 +4674,11 @@ static int generic_checks(SMTPD_STATE *state, ARGV *restrictions,
cpp[1], CHECK_RELAY_DOMAINS);
} else if (strcasecmp(name, PERMIT_SASL_AUTH) == 0) {
#ifdef USE_SASL_AUTH
- if (smtpd_sasl_is_active(state)) {
- status = permit_sasl_auth(state,
- SMTPD_CHECK_OK, SMTPD_CHECK_DUNNO);
- if (status == SMTPD_CHECK_OK)
- status = smtpd_acl_permit(state, name, SMTPD_NAME_CLIENT,
- state->namaddr, NO_PRINT_ARGS);
- }
+ status = permit_sasl_auth(state,
+ SMTPD_CHECK_OK, SMTPD_CHECK_DUNNO);
+ if (status == SMTPD_CHECK_OK)
+ status = smtpd_acl_permit(state, name, SMTPD_NAME_CLIENT,
+ state->namaddr, NO_PRINT_ARGS);
#endif
} else if (strcasecmp(name, PERMIT_TLS_ALL_CLIENTCERTS) == 0) {
status = permit_tls_clientcerts(state, 1);