base.m4, auth.m4: Track a per-message authenticated user.

[exim-config] / base.m4

diff --git a/base.m4 b/base.m4
index a00757e..cb0f7a6 100644 (file)
--- a/base.m4
+++ b/base.m4
@@ -147,6 +147,7 @@ SECTION(acl, misc)m4_dnl
 not_smtp_start:
        ## Record the user's name.
        warn     set acl_c_user = $sender_ident
+                set acl_m_user = $sender_ident
 
        ## Done.
        accept
@@ -312,6 +313,10 @@ mail_check_auth:
        deny     message = Sender not authenticated
                 condition = ${if !def:acl_c_user}
 
+       ## Set the per-message authentication flag, since we now know that
+       ## there's a sensible value.
+       warn     set acl_m_user = $acl_c_user
+
        ## All done.
        accept