summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2012-02-19 17:03:06 -0500
committerPhil Pennock <pdp@exim.org>2012-02-19 17:06:54 -0500
commitb98bb9ac90bfc9c812c4c660fe017284ee222686 (patch)
tree1b7ecc194432cca05b39904f3c22efe8daf1e444 /src
parent4c287009d6b6581236a2c2fdfc828552d2d61f0d (diff)
Log auth data in rejectlog.
http://bugs.exim.org/attachment.cgi?id=547&action=edit fixes bug: 1214 Patch by Jeremy Harris
Diffstat (limited to 'src')
-rw-r--r--src/src/smtp_in.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 7ca56e255..e79f0a202 100644
--- 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