ph10 2005/04/06 17:43:59 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src receive.c
exim-test-orig/AutoTest/confs 075
exim-test-orig/AutoTest/log 075
exim-test-orig/AutoTest/stderr 075
Log:
Add sender to log line for DATA timeout.
Revision Changes Path
1.119 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.14 +3 -2 exim/exim-src/src/receive.c
1.2 +1 -51 exim/exim-test-orig/AutoTest/confs/075
1.2 +2 -2 exim/exim-test-orig/AutoTest/log/075
1.2 +1 -1 exim/exim-test-orig/AutoTest/stderr/075
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- ChangeLog 6 Apr 2005 16:26:42 -0000 1.118
+++ ChangeLog 6 Apr 2005 16:43:59 -0000 1.119
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.118 2005/04/06 16:26:42 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -195,6 +195,9 @@
router that accepted the address. It now behaves in the same way as it
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.
Index: receive.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/receive.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- receive.c 4 Apr 2005 10:33:49 -0000 1.13
+++ receive.c 6 Apr 2005 16:43:59 -0000 1.14
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/receive.c,v 1.13 2005/04/04 10:33:49 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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
{
Index: 075
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/075,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 075 8 Oct 2004 14:49:15 -0000 1.1
+++ 075 6 Apr 2005 16:43:59 -0000 1.2
@@ -1,22 +1,6 @@
-#!!# This file is output from the convert4r4 script, which tries
-#!!# to convert Exim 3 configurations into Exim 4 configurations.
-#!!# However, is is not perfect, especially with non-simple
-#!!# configurations. You must check it before running it.
-
-
-#!!# These options specify the Access Control Lists (ACLs) that
-#!!# are used for incoming SMTP messages - after the RCPT and DATA
-#!!# commands, respectively.
-
acl_smtp_rcpt = check_recipient
acl_smtp_data = check_message
-#!!# This setting defines a named domain list called
-#!!# local_domains, created from the old options that
-#!!# referred to local domains. It will be referenced
-#!!# later on by the syntax "+local_domains".
-#!!# Other domain and host lists may follow.
-
domainlist local_domains = test.ex : *.test.ex
domainlist relay_domains = test.ex
@@ -34,25 +18,12 @@
# ----- Main settings -----
smtp_receive_timeout = 2s
-#!!# accept_timeout renamed receive_timeout
receive_timeout = 2s
-#!!#######################################################!!#
-#!!# This new section of the configuration contains ACLs #!!#
-#!!# (Access Control Lists) derived from the Exim 3 #!!#
-#!!# policy control options. #!!#
-#!!#######################################################!!#
-
-#!!# These ACLs are crudely constructed from Exim 3 options.
-#!!# They are almost certainly not optimal. You should study
-#!!# them and rewrite as necessary.
-
begin acl
-#!!# ACL that is used after the RCPT command
check_recipient:
- # Exim 3 had no checking on -bs messages
accept hosts = :
deny message = unrouteable address
recipients = verify@???
@@ -61,7 +32,6 @@
accept domains = +relay_domains
deny message = relay not permitted
-#!!# ACL that is used after the DATA command
check_message:
accept
@@ -70,31 +40,18 @@
# End
-#!!#######################################################!!#
-#!!# Here follow routers created from the old routers, #!!#
-#!!# for handling non-local domains. #!!#
-#!!#######################################################!!#
-begin routers
# ----- Routers -----
-
-#!!# This new router is put here to fail all domains that
-#!!# were not in local_domains in the Exim 3 configuration.
+begin routers
fail_remote_domains:
driver = redirect
domains = ! +local_domains
data = :fail: unrouteable mail domain "$domain"
-
-#!!#######################################################!!#
-#!!# Here follow routers created from the old directors, #!!#
-#!!# for handling local domains. #!!#
-#!!#######################################################!!#
-
# ----- Directors -----
forward:
@@ -102,12 +59,5 @@
no_check_local_user
file = DIR/aux/non-exist
retry_use_local_part
-
-
-# ----- Transports -----
-
-
-# ----- Retry -----
-
# End of Exim 4 configuration
Index: 075
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/075,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 075 8 Oct 2004 14:49:31 -0000 1.1
+++ 075 6 Apr 2005 16:43:59 -0000 1.2
@@ -1,6 +1,6 @@
1999-03-02 09:44:33 SMTP command timeout on connection from ph10
-1999-03-02 09:44:33 SMTP data timeout (message abandoned) on connection from local process
+1999-03-02 09:44:33 SMTP data timeout (message abandoned) on connection from local process F=<ph10@???>
1999-03-02 09:44:33 timed out while reading local message
1999-03-02 09:44:33 10HmaX-0005vi-00 timed out while reading local message
1999-03-02 09:44:33 SMTP command timeout on connection from ph10
-1999-03-02 09:44:33 SMTP data timeout (message abandoned) on connection from local process
+1999-03-02 09:44:33 SMTP data timeout (message abandoned) on connection from local process F=<ph10@???>
Index: 075
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/075,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 075 8 Oct 2004 14:50:08 -0000 1.1
+++ 075 6 Apr 2005 16:43:59 -0000 1.2
@@ -29,7 +29,7 @@
>>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
>>> test.ex in "+local_domains"? yes (matched "+local_domains")
>>> accept: condition test succeeded
-LOG: SMTP data timeout (message abandoned) on connection from [10.0.0.1]
+LOG: SMTP data timeout (message abandoned) on connection from [10.0.0.1] F=<ph10@???>
exim: timed out while reading - message abandoned
exim: timed out while reading - message abandoned
>>> host in hosts_connection_nolog? no (option unset)
