Skip to content

MMA-11008. fix extended auth patch #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CalciuAndrei merged 1 commit into from
Jun 18, 2026
+18 −13
Merged

MMA-11008. fix extended auth patch #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions src/src/smtp_in.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3445,6 +3445,9 @@ if (acl_smtp_auth != NULL)
if (acl_rc != OK)
{
smtp_handle_acl_fail(ACL_WHERE_AUTH, acl_rc, user_msg, log_msg);
if (set_id) authenticated_fail_id = string_copy_perm(set_id, TRUE);
*smtp_resp = US"535 Incorrect authentication data";
*errmsg = string_sprintf("535 Incorrect authentication data%s", set_id);
return acl_rc;
Comment thread
bitsikas marked this conversation as resolved.
}
}
Expand All @@ -3463,16 +3466,6 @@ switch(rc)
case OK:
if (!au->set_id || set_id) /* Complete success */
{
if (acl_smtp_auth_accept != NULL)
{
acl_rc = acl_check(ACL_WHERE_AUTH, NULL, acl_smtp_auth_accept, &user_msg, &log_msg);
if (acl_rc != OK)
{
smtp_handle_acl_fail(ACL_WHERE_AUTH, acl_rc, user_msg, log_msg);
rc = acl_rc;
break;
}
}
if (set_id) authenticated_id = string_copy_perm(set_id, TRUE);
sender_host_authenticated = au->name;
sender_host_auth_pubname = au->public_name;
Expand All @@ -3484,6 +3477,17 @@ switch(rc)
[pextend + pauthed + (tls_in.active.sock >= 0 ? pcrpted:0)];
*smtp_resp = *errmsg = US"235 Authentication succeeded";
authenticated_by = au;

if (acl_smtp_auth_accept != NULL)
{
Comment thread
bitsikas marked this conversation as resolved.
acl_rc = acl_check(ACL_WHERE_AUTH, NULL, acl_smtp_auth_accept, &user_msg, &log_msg);
if (acl_rc != OK)
{
smtp_handle_acl_fail(ACL_WHERE_AUTH, acl_rc, user_msg, log_msg);
rc = acl_rc;
break;
}
}
break;
}

Expand Down Expand Up @@ -3514,6 +3518,10 @@ switch(rc)
break;

case FAIL:
if (set_id) authenticated_fail_id = string_copy_perm(set_id, TRUE);
*smtp_resp = US"535 Incorrect authentication data";
*errmsg = string_sprintf("535 Incorrect authentication data%s", set_id);

if (acl_smtp_auth_fail != NULL)
{
acl_rc = acl_check(ACL_WHERE_AUTH, NULL, acl_smtp_auth_fail, &user_msg, &log_msg);
Expand All @@ -3523,9 +3531,6 @@ switch(rc)
break;
}
}
if (set_id) authenticated_fail_id = string_copy_perm(set_id, TRUE);
*smtp_resp = US"535 Incorrect authentication data";
*errmsg = string_sprintf("535 Incorrect authentication data%s", set_id);
break;

default:
Expand Down