diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-04-06 16:43:59 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-04-06 16:43:59 +0000 |
| commit | fed770203382d612a893e070efb774a72be341b0 (patch) | |
| tree | 7fad39f2a50d0222d2a0b99d6b43f26e4bcd497b | |
| parent | c688b954091b55561b0c15b555b2f88c96c1a29d (diff) | |
Add sender to log line for DATA timeout.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 5 | ||||
| -rw-r--r-- | src/src/receive.c | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index fb21a0f77..08f59181f 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.118 2005/04/06 16:26:42 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.119 2005/04/06 16:43:59 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -196,6 +196,9 @@ PH/31 When doing a callout as part of verifying an address, Exim was not paying does for delivery: the affixes are removed from the local part unless rcpt_include_affixes is set on the transport. +PH/32 Add the sender address, as F=<...>, to the log line when logging a + timeout during the DATA phase of an incoming message. + A note about Exim versions 4.44 and 4.50 diff --git a/src/src/receive.c b/src/src/receive.c index 325544643..dc0ff69a6 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/receive.c,v 1.13 2005/04/04 10:33:49 ph10 Exp $ */ +/* $Cambridge: exim/src/src/receive.c,v 1.14 2005/04/06 16:43:59 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -351,8 +351,9 @@ if (smtp_input) msg = US"SMTP incoming data timeout"; log_write(L_lost_incoming_connection, LOG_MAIN, "SMTP data timeout (message abandoned) on connection " - "from %s", - (sender_fullhost != NULL)? sender_fullhost : US"local process"); + "from %s F=<%s>", + (sender_fullhost != NULL)? sender_fullhost : US"local process", + sender_address); } else { |