Log auth data in rejectlog.

http://bugs.exim.org/attachment.cgi?id=547&action=edit
fixes bug: 1214
Patch by Jeremy Harris

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index d5bbafbb5ad4d7ff8dba9f5911e41805de413be5..39b6107b7fa861435f57b7ec0e065a09d9b61ff4 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -34,6 +34,9 @@ PP/07 New expansion variable $tls_bits; Cyrus SASL server connection
 
 PP/08 cyrus_sasl server now expands the server_realm option.
 
+PP/09 Bugzilla 1214 - Log authentication information in reject log.
+      Patch by Jeremy Harris.
+
 
 Exim version 4.77
 -----------------

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 7ca56e25527cb2747cedfd6a35b3596c6b533e00..e79f0a202e233c010aaa25e11ab600f3edd0e66b 100644 (file)
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -2200,8 +2200,13 @@ if (where == ACL_WHERE_RCPT || where == ACL_WHERE_DATA)
 if (where == ACL_WHERE_RCPT || where == ACL_WHERE_DATA || where == ACL_WHERE_MIME)
 #endif
   {
-  sender_info = string_sprintf("F=<%s> ", (sender_address_unrewritten != NULL)?
-    sender_address_unrewritten : sender_address);
+  sender_info = string_sprintf("F=<%s>%s%s%s%s ",
+    sender_address_unrewritten ? sender_address_unrewritten : sender_address,
+    sender_host_authenticated ? US" A="                                    : US"",
+    sender_host_authenticated ? sender_host_authenticated                  : US"",
+    sender_host_authenticated && authenticated_id ? US":"                  : US"",
+    sender_host_authenticated && authenticated_id ? authenticated_id       : US""
+    );
   }
 
 /* If there's been a sender verification failure with a specific message, and