diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-11-29 23:22:34 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-11-30 00:27:26 +0000 |
| commit | b64d13ee7a7b9a398159d75e6e71c018a3cf2690 (patch) | |
| tree | 525cc690460b97ac00d4f133707fa7ce05c149bc /src | |
| parent | 69d8eed78db16f47ad71f53fbf3b2b9dc00f460b (diff) | |
TLS: avoid calling smtp_auth_acl on client cert when no tls authenticator is configured
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/smtp_in.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 1f1e7ddd4..28586f33d 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -3849,24 +3849,24 @@ while (done <= 0) ) { cmd_list[CMD_LIST_TLS_AUTH].is_mail_cmd = FALSE; - if ( acl_smtp_auth - && (rc = acl_check(ACL_WHERE_AUTH, NULL, acl_smtp_auth, - &user_msg, &log_msg)) != OK - ) - { - done = smtp_handle_acl_fail(ACL_WHERE_AUTH, rc, user_msg, log_msg); - continue; - } for (au = auths; au; au = au->next) if (strcmpic(US"tls", au->driver_name) == 0) { - smtp_cmd_data = NULL; - - if (smtp_in_auth(au, &s, &ss) == OK) - { DEBUG(D_auth) debug_printf("tls auth succeeded\n"); } + if ( acl_smtp_auth + && (rc = acl_check(ACL_WHERE_AUTH, NULL, acl_smtp_auth, + &user_msg, &log_msg)) != OK + ) + done = smtp_handle_acl_fail(ACL_WHERE_AUTH, rc, user_msg, log_msg); else - { DEBUG(D_auth) debug_printf("tls auth not succeeded\n"); } + { + smtp_cmd_data = NULL; + + if (smtp_in_auth(au, &s, &ss) == OK) + { DEBUG(D_auth) debug_printf("tls auth succeeded\n"); } + else + { DEBUG(D_auth) debug_printf("tls auth not succeeded\n"); } + } break; } } |