auth.m4: Report the message's authenticated sender at `DATA' time.
authorMark Wooding <mdw@distorted.org.uk>
Thu, 24 Mar 2016 11:06:41 +0000 (11:06 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 24 Mar 2016 11:07:02 +0000 (11:07 +0000)
This leaves a handy dropping in the log file which allows us to
associate message queue ids with authenticated users.

auth.m4

diff --git a/auth.m4 b/auth.m4
index 04e1a07..817bfd6 100644 (file)
--- a/auth.m4
+++ b/auth.m4
@@ -105,5 +105,13 @@ mailauth:
        ## Otherwise we can't tell who really sent it.
        deny     message = Authenticated user not authoritative for claimed sender.
 
+SECTION(acl, data-hooks)m4_dnl
+       ## Report the `AUTH=' value, if we have one.  This is delayed from
+       ## the above so that Exim can figure out a queue id.  Once it's done
+       ## so, apparently it reports that automatically, so we don't need to
+       ## mention `$message_exim_id' explicitly here.
+       warn     condition = ${if def:acl_m_user}
+                logwrite = AUTH=${quote:$acl_m_user}
+
 DIVERT(null)
 ###----- That's all, folks --------------------------------------------------