ph10 2005/06/29 15:17:02 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src retry.c
exim-src/src/transports smtp.c
exim-test-orig/AutoTest/confs 537
exim-test-orig/AutoTest/log 079 081 132 133 162 360 374 402
412 424 526 530 537 580 581 600
605 608
exim-test-orig/AutoTest/mail 079.ph10 360.ph10 526.ph10
605.ph10
exim-test-orig/AutoTest/msglog 580.10HmaY-0005vi-00
exim-test-orig/AutoTest/scripts 537
exim-test-orig/AutoTest/stderr 581 600
Added files:
exim-test-orig/AutoTest/mail 537.ph10
Log:
Allow "retry timeout exceeded" and a couple of other similar messages to
appear in bounce messages (the default nowadays is not to give details).
Revision Changes Path
1.179 +3 -2 exim/exim-doc/doc-txt/ChangeLog
1.3 +3 -0 exim/exim-src/src/retry.c
1.13 +1 -0 exim/exim-src/src/transports/smtp.c
1.2 +13 -1 exim/exim-test-orig/AutoTest/confs/537
1.3 +5 -5 exim/exim-test-orig/AutoTest/log/079
1.3 +2 -2 exim/exim-test-orig/AutoTest/log/081
1.3 +2 -2 exim/exim-test-orig/AutoTest/log/132
1.4 +2 -2 exim/exim-test-orig/AutoTest/log/133
1.3 +1 -1 exim/exim-test-orig/AutoTest/log/162
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/360
1.3 +9 -9 exim/exim-test-orig/AutoTest/log/374
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/402
1.3 +1 -1 exim/exim-test-orig/AutoTest/log/412
1.4 +1 -1 exim/exim-test-orig/AutoTest/log/424
1.3 +1 -1 exim/exim-test-orig/AutoTest/log/526
1.3 +1 -1 exim/exim-test-orig/AutoTest/log/530
1.3 +21 -3 exim/exim-test-orig/AutoTest/log/537
1.3 +1 -1 exim/exim-test-orig/AutoTest/log/580
1.3 +1 -1 exim/exim-test-orig/AutoTest/log/581
1.3 +2 -2 exim/exim-test-orig/AutoTest/log/600
1.3 +1 -1 exim/exim-test-orig/AutoTest/log/605
1.3 +1 -1 exim/exim-test-orig/AutoTest/log/608
1.3 +5 -0 exim/exim-test-orig/AutoTest/mail/079.ph10
1.2 +1 -1 exim/exim-test-orig/AutoTest/mail/360.ph10
1.3 +1 -0 exim/exim-test-orig/AutoTest/mail/526.ph10
1.1 +96 -0 exim/exim-test-orig/AutoTest/mail/537.ph10 (new)
1.3 +1 -0 exim/exim-test-orig/AutoTest/mail/605.ph10
1.3 +1 -1 exim/exim-test-orig/AutoTest/msglog/580.10HmaY-0005vi-00
1.2 +14 -0 exim/exim-test-orig/AutoTest/scripts/537
1.8 +2 -2 exim/exim-test-orig/AutoTest/stderr/581
1.4 +2 -2 exim/exim-test-orig/AutoTest/stderr/600
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- ChangeLog 28 Jun 2005 20:50:56 -0000 1.178
+++ ChangeLog 29 Jun 2005 14:17:01 -0000 1.179
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.178 2005/06/28 20:50:56 steve Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.179 2005/06/29 14:17:01 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -160,8 +160,9 @@
"%lld" and "long long". Replaced the call to snprintf() with a call to
string_vformat().
-PH/21 Added another message to those in 4.51/PH/42, namely "All relevant MX
- records point to non-existent hosts".
+PH/21 Added some other messages to those in 4.51/PH/42, namely "All relevant MX
+ records point to non-existent hosts", "retry timeout exceeded", and
+ "retry time not reached for any host after a long failure period".
PH/22 Fixed some oversights/typos causing bugs when Exim is compiled with
experimental DomainKeys support:
Index: retry.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/retry.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- retry.c 4 Jan 2005 10:00:42 -0000 1.2
+++ retry.c 29 Jun 2005 14:17:01 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/retry.c,v 1.2 2005/01/04 10:00:42 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/retry.c,v 1.3 2005/06/29 14:17:01 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -842,6 +842,9 @@
setflag(addr, af_retry_timedout);
addr->message = (addr->message == NULL)? US"retry timeout exceeded" :
string_sprintf("%s: retry timeout exceeded", addr->message);
+ addr->user_message = (addr->user_message == NULL)?
+ US"retry timeout exceeded" :
+ string_sprintf("%s: retry timeout exceeded", addr->user_message);
log_write(0, LOG_MAIN, "** %s%s%s%s: retry timeout exceeded",
addr->address,
(addr->parent == NULL)? US"" : US" <",
Index: smtp.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/smtp.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- smtp.c 27 Jun 2005 14:29:45 -0000 1.12
+++ smtp.c 29 Jun 2005 14:17:01 -0000 1.13
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.12 2005/06/27 14:29:45 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.13 2005/06/29 14:17:01 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2788,6 +2788,7 @@
}
else if (expired)
{
+ setflag(addr, af_pass_message); /* This is not a security risk */
addr->message = (ob->delay_after_cutoff)?
US"retry time not reached for any host after a long failure period" :
US"all hosts have been failing for a long time and were last tried "
Index: 537
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/537,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 537 8 Oct 2004 14:49:16 -0000 1.1
+++ 537 29 Jun 2005 14:17:02 -0000 1.2
@@ -1,6 +1,7 @@
# Exim test configuration 537
FALLBACK=fallback_hosts = 127.0.0.1
+ROUTE_DATA=10.0.0.1
# Macros are set externally in order to get the path
# of the Exim that is being tested, and the directory
@@ -20,9 +21,14 @@
begin routers
+r0:
+ driver = accept
+ senders = :
+ transport = t2
+
r1:
driver = manualroute
- route_data = 10.0.0.1
+ route_data = ROUTE_DATA
transport = t1
FALLBACK
@@ -36,12 +42,18 @@
connect_timeout = 1s
allow_localhost
+t2:
+ driver = appendfile
+ file = DIR/test-mail/$local_part
+ user = CALLER
+
# ----- Retry -----
begin retry
10.0.0.1 * F,1s,1s
+10.0.0.2 * F,1s,2s
* * F,1d,1s
Index: 079
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/079,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 079 28 Apr 2005 13:06:33 -0000 1.2
+++ 079 29 Jun 2005 14:17:02 -0000 1.3
@@ -50,7 +50,7 @@
1999-03-02 09:44:33 10HmbI-0005vi-00 "should give filter error (3)" first delivery
1999-03-02 09:44:33 10HmbI-0005vi-00 == filter-lookup@??? R=userfilter defer (-17): error in filter file: failed to expand "${lookup{$local_part}lsearch{/etc/passwd}{$value}fail}" in deliver command: lookup expansions are not permitted
1999-03-02 09:44:33 10HmbI-0005vi-00 ** filter-lookup@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbJ-0005vi-00 <= <> R=10HmbI-0005vi-00 U=exim P=local S=1115
+1999-03-02 09:44:33 10HmbJ-0005vi-00 <= <> R=10HmbI-0005vi-00 U=exim P=local S=1142
1999-03-02 09:44:33 10HmbJ-0005vi-00 "Mail delivery failed: returning message to sender" first delivery
1999-03-02 09:44:33 10HmbJ-0005vi-00 => ph10 <ph10@???> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
@@ -59,7 +59,7 @@
1999-03-02 09:44:33 10HmbK-0005vi-00 "should give filter error (4)" first delivery
1999-03-02 09:44:33 10HmbK-0005vi-00 == filter-exists@??? R=userfilter defer (-17): error in filter file: failed to expand "${if exists{/tmp/junk}{abc}{def}}" in deliver command: File existence tests are not permitted
1999-03-02 09:44:33 10HmbK-0005vi-00 ** filter-exists@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbL-0005vi-00 <= <> R=10HmbK-0005vi-00 U=exim P=local S=1115
+1999-03-02 09:44:33 10HmbL-0005vi-00 <= <> R=10HmbK-0005vi-00 U=exim P=local S=1142
1999-03-02 09:44:33 10HmbL-0005vi-00 "Mail delivery failed: returning message to sender" first delivery
1999-03-02 09:44:33 10HmbL-0005vi-00 => ph10 <ph10@???> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
@@ -68,7 +68,7 @@
1999-03-02 09:44:33 10HmbM-0005vi-00 "should give filter error (5)" first delivery
1999-03-02 09:44:33 10HmbM-0005vi-00 == filter-readfile@??? R=userfilter defer (-17): error in filter file: failed to expand "${readfile{/some/file}}" in deliver command: file insertions are not permitted
1999-03-02 09:44:33 10HmbM-0005vi-00 ** filter-readfile@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbN-0005vi-00 <= <> R=10HmbM-0005vi-00 U=exim P=local S=1121
+1999-03-02 09:44:33 10HmbN-0005vi-00 <= <> R=10HmbM-0005vi-00 U=exim P=local S=1148
1999-03-02 09:44:33 10HmbN-0005vi-00 "Mail delivery failed: returning message to sender" first delivery
1999-03-02 09:44:33 10HmbN-0005vi-00 => ph10 <ph10@???> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
@@ -77,7 +77,7 @@
1999-03-02 09:44:33 10HmbO-0005vi-00 "should give filter error (6)" first delivery
1999-03-02 09:44:33 10HmbO-0005vi-00 == filter-run@??? R=userfilter defer (-17): error in filter file: failed to expand "${run{/some/script}}" in deliver command: running a command is not permitted
1999-03-02 09:44:33 10HmbO-0005vi-00 ** filter-run@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbP-0005vi-00 <= <> R=10HmbO-0005vi-00 U=exim P=local S=1106
+1999-03-02 09:44:33 10HmbP-0005vi-00 <= <> R=10HmbO-0005vi-00 U=exim P=local S=1133
1999-03-02 09:44:33 10HmbP-0005vi-00 "Mail delivery failed: returning message to sender" first delivery
1999-03-02 09:44:33 10HmbP-0005vi-00 => ph10 <ph10@???> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbP-0005vi-00 Completed
@@ -121,7 +121,7 @@
1999-03-02 09:44:33 10HmbU-0005vi-00 == readfile@??? R=fail_read_filter defer (-17): error in filter file: failed to expand "${readfile{/source/exim4/AutoTest/test.private}}" in filter file: failed to open /source/exim4/AutoTest/test.private: Permission denied (euid=1169 egid=1169)
1999-03-02 09:44:33 10HmbU-0005vi-00 => mug999 <system-filter> R=users T=appendfile
1999-03-02 09:44:33 10HmbU-0005vi-00 ** readfile@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbV-0005vi-00 <= <> R=10HmbU-0005vi-00 U=exim P=local S=1096
+1999-03-02 09:44:33 10HmbV-0005vi-00 <= <> R=10HmbU-0005vi-00 U=exim P=local S=1123
1999-03-02 09:44:33 10HmbV-0005vi-00 "Mail delivery failed: returning message to sender" first delivery
1999-03-02 09:44:33 10HmbV-0005vi-00 => ph10 <ph10@???> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbV-0005vi-00 Completed
Index: 081
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/081,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 081 28 Apr 2005 13:06:33 -0000 1.2
+++ 081 29 Jun 2005 14:17:02 -0000 1.3
@@ -18,14 +18,14 @@
1999-03-02 09:44:33 10HmbC-0005vi-00 plain authenticator failed H=127.0.0.1 [127.0.0.1] 535 Sorry, authentication failed
1999-03-02 09:44:33 10HmbC-0005vi-00 == ph10@??? R=force T=smtp_force defer (-42): authentication required but authentication attempt(s) failed
1999-03-02 09:44:33 10HmbC-0005vi-00 ** ph10@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=exim P=local S=1047
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=exim P=local S=1074
1999-03-02 09:44:33 10HmbD-0005vi-00 ** ph10@???: Unrouteable address
1999-03-02 09:44:33 10HmbD-0005vi-00 Frozen (delivery error message)
1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
1999-03-02 09:44:33 10HmbE-0005vi-00 <= ph10@??? U=ph10 P=local S=267
1999-03-02 09:44:33 10HmbE-0005vi-00 == ph10@??? R=force T=smtp_force defer (-42): authentication required but server did not advertise AUTH support
1999-03-02 09:44:33 10HmbE-0005vi-00 ** ph10@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=exim P=local S=1047
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=exim P=local S=1074
1999-03-02 09:44:33 10HmbF-0005vi-00 ** ph10@???: Unrouteable address
1999-03-02 09:44:33 10HmbF-0005vi-00 Frozen (delivery error message)
1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
Index: 132
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/132,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 132 28 Apr 2005 13:06:33 -0000 1.2
+++ 132 29 Jun 2005 14:17:02 -0000 1.3
@@ -8,7 +8,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 == b@??? R=default T=smtp defer (110): Connection timed out
1999-03-02 09:44:33 10HmaX-0005vi-00 ** b@???: retry timeout exceeded
1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1051
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1102
1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <ph10@???> R=null
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp
@@ -22,7 +22,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=default T=smtp defer (110): Connection timed out
1999-03-02 09:44:33 10HmaX-0005vi-00 ** a@???: retry timeout exceeded
1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1055
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1106
1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <ph10@???> R=null
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
Index: 133
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/133,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 133 17 May 2005 15:00:04 -0000 1.3
+++ 133 29 Jun 2005 14:17:02 -0000 1.4
@@ -2,7 +2,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 == forwarder2@??? R=forward defer (-17): error in filter file: errors_to must point to the caller's address
1999-03-02 09:44:33 10HmaX-0005vi-00 ** unknown@??? <forwarder@???> R=unknown: Address unknown (:fail:)
1999-03-02 09:44:33 10HmaX-0005vi-00 ** forwarder2@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1020
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1047
1999-03-02 09:44:33 10HmaY-0005vi-00 ** abcd@??? R=fail_remote_domains: unrouteable mail domain "x.y.z" (:fail:)
1999-03-02 09:44:33 10HmaY-0005vi-00 abcd@???: error ignored
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
@@ -14,7 +14,7 @@
1999-03-02 09:44:33 10HmbA-0005vi-00 == forwarder2@??? R=forward defer (-17): error in filter file: errors_to must point to the caller's address
1999-03-02 09:44:33 10HmbA-0005vi-00 ** unknown@??? <forwarder@???> R=unknown: Address unknown (:fail:)
1999-03-02 09:44:33 10HmbA-0005vi-00 ** forwarder2@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=989
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1016
1999-03-02 09:44:33 10HmbB-0005vi-00 ** abcd@??? R=fail_remote_domains: unrouteable mail domain "x.y.z" (:fail:)
1999-03-02 09:44:33 10HmbB-0005vi-00 abcd@???: error ignored
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
Index: 162
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/162,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 162 28 Apr 2005 13:06:33 -0000 1.2
+++ 162 29 Jun 2005 14:17:02 -0000 1.3
@@ -5,7 +5,7 @@
1999-03-02 09:44:33 Start queue run: pid=pppp
1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=all T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 452 Temporary error
1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1187
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1062
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp
1999-03-02 09:44:33 Start queue run: pid=pppp
Index: 360
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/360,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 360 8 Oct 2004 14:49:31 -0000 1.1
+++ 360 29 Jun 2005 14:17:02 -0000 1.2
@@ -1,7 +1,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=315
1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@??? R=all T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to /source/exim4/AutoTest/test-mail/abcd)
1999-03-02 09:44:33 10HmaX-0005vi-00 ** abcd@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=692
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=716
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=bounce T=bounce
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
Index: 374
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/374,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 374 28 Apr 2005 13:06:33 -0000 1.2
+++ 374 29 Jun 2005 14:17:02 -0000 1.3
@@ -2,7 +2,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to pipelined DATA
1999-03-02 09:44:33 10HmaX-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to pipelined DATA
1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1017
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1044
1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <ph10@???> R=null
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
@@ -10,7 +10,7 @@
1999-03-02 09:44:33 10HmaZ-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<x@???>
1999-03-02 09:44:33 10HmaZ-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<x@???>
1999-03-02 09:44:33 10HmaZ-0005vi-00 ** x@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1017
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1044
1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <ph10@???> R=null
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
@@ -18,7 +18,7 @@
1999-03-02 09:44:33 10HmbB-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to MAIL FROM:<ph10@???>
1999-03-02 09:44:33 10HmbB-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to MAIL FROM:<ph10@???>
1999-03-02 09:44:33 10HmbB-0005vi-00 ** x@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=1017
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=1044
1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <ph10@???> R=null
1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
@@ -30,7 +30,7 @@
1999-03-02 09:44:33 10HmbD-0005vi-00 ** z@???: retry timeout exceeded
1999-03-02 09:44:33 10HmbD-0005vi-00 ** y@???: retry timeout exceeded
1999-03-02 09:44:33 10HmbD-0005vi-00 ** x@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=1052
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=1133
1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <ph10@???> R=null
1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
@@ -39,7 +39,7 @@
1999-03-02 09:44:33 10HmbF-0005vi-00 == b@??? R=remote T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 450 Recipient bad
1999-03-02 09:44:33 10HmbF-0005vi-00 ** b@???: retry timeout exceeded
1999-03-02 09:44:33 10HmbF-0005vi-00 ** a@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=exim P=local S=1315
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=exim P=local S=1081
1999-03-02 09:44:33 10HmbG-0005vi-00 => :blackhole: <ph10@???> R=null
1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
@@ -47,7 +47,7 @@
1999-03-02 09:44:33 10HmbH-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to DATA
1999-03-02 09:44:33 10HmbH-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to DATA
1999-03-02 09:44:33 10HmbH-0005vi-00 ** x@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbI-0005vi-00 <= <> R=10HmbH-0005vi-00 U=exim P=local S=1017
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= <> R=10HmbH-0005vi-00 U=exim P=local S=1044
1999-03-02 09:44:33 10HmbI-0005vi-00 => :blackhole: <ph10@???> R=null
1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
@@ -55,7 +55,7 @@
1999-03-02 09:44:33 10HmbJ-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<x@???>
1999-03-02 09:44:33 10HmbJ-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<x@???>
1999-03-02 09:44:33 10HmbJ-0005vi-00 ** x@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbK-0005vi-00 <= <> R=10HmbJ-0005vi-00 U=exim P=local S=1017
+1999-03-02 09:44:33 10HmbK-0005vi-00 <= <> R=10HmbJ-0005vi-00 U=exim P=local S=1044
1999-03-02 09:44:33 10HmbK-0005vi-00 => :blackhole: <ph10@???> R=null
1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
@@ -63,7 +63,7 @@
1999-03-02 09:44:33 10HmbL-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to MAIL FROM:<ph10@???>
1999-03-02 09:44:33 10HmbL-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to MAIL FROM:<ph10@???>
1999-03-02 09:44:33 10HmbL-0005vi-00 ** x@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> R=10HmbL-0005vi-00 U=exim P=local S=1017
+1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> R=10HmbL-0005vi-00 U=exim P=local S=1044
1999-03-02 09:44:33 10HmbM-0005vi-00 => :blackhole: <ph10@???> R=null
1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
@@ -75,7 +75,7 @@
1999-03-02 09:44:33 10HmbN-0005vi-00 ** z@???: retry timeout exceeded
1999-03-02 09:44:33 10HmbN-0005vi-00 ** y@???: retry timeout exceeded
1999-03-02 09:44:33 10HmbN-0005vi-00 ** x@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbO-0005vi-00 <= <> R=10HmbN-0005vi-00 U=exim P=local S=1052
+1999-03-02 09:44:33 10HmbO-0005vi-00 <= <> R=10HmbN-0005vi-00 U=exim P=local S=1133
1999-03-02 09:44:33 10HmbO-0005vi-00 => :blackhole: <ph10@???> R=null
1999-03-02 09:44:33 10HmbO-0005vi-00 Completed
1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
Index: 402
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/402,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 402 8 Oct 2004 14:49:31 -0000 1.1
+++ 402 29 Jun 2005 14:17:02 -0000 1.2
@@ -3,7 +3,7 @@
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to /source/exim4/AutoTest/test-mail/a)
1999-03-02 09:44:33 10HmaX-0005vi-00 ** a@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1077
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1101
1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to /source/exim4/AutoTest/test-mail/ph10)
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
Index: 412
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/412,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 412 28 Apr 2005 13:06:33 -0000 1.2
+++ 412 29 Jun 2005 14:17:02 -0000 1.3
@@ -1,7 +1,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=273
1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r0 defer (-1): ".forward" is not an absolute path
1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1023
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1050
1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=r0 defer (-1): ".forward" is not an absolute path
1999-03-02 09:44:33 10HmaY-0005vi-00 ** ph10@???: retry timeout exceeded
1999-03-02 09:44:33 10HmaY-0005vi-00 ph10@???: error ignored
Index: 424
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/424,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 424 28 Apr 2005 13:06:33 -0000 1.3
+++ 424 29 Jun 2005 14:17:02 -0000 1.4
@@ -17,7 +17,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 black-2.test.ex [10.11.12.14]: Connection timed out
1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=smtp defer (110): Connection timed out
1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1033
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1060
1999-03-02 09:44:33 10HmaY-0005vi-00 ** ph10@???: Unrouteable address
1999-03-02 09:44:33 10HmaY-0005vi-00 ph10@???: error ignored
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
Index: 526
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/526,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 526 28 Apr 2005 13:06:33 -0000 1.2
+++ 526 29 Jun 2005 14:17:02 -0000 1.3
@@ -8,7 +8,7 @@
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=277
1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph10@??? R=r1 defer (-17): error in filter file: \n not followed by space or valid header name in "h1: the first added header\nh2: the second added header\n continued on another line\nh3 the third added header is missing a colon" in mail command
1999-03-02 09:44:33 10HmaZ-0005vi-00 ** ph10@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1015
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1042
1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=r2 T=t1
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
Index: 530
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/530,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 530 28 Apr 2005 13:06:33 -0000 1.2
+++ 530 29 Jun 2005 14:17:02 -0000 1.3
@@ -8,7 +8,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [10.0.0.4]: Connection timed out
1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=smtp defer (110): Connection timed out
1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1033
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1060
1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp
Index: 537
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/537,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 537 28 Apr 2005 13:06:33 -0000 1.2
+++ 537 29 Jun 2005 14:17:02 -0000 1.3
@@ -13,7 +13,25 @@
1999-03-02 09:44:33 10HmbA-0005vi-00 10.0.0.1 [10.0.0.1]: Connection timed out
1999-03-02 09:44:33 10HmbA-0005vi-00 == ph10@??? R=r1 T=t1 defer (110): Connection timed out
1999-03-02 09:44:33 10HmbA-0005vi-00 ** ph10@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1005
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** ph10@??? R=r1 T=t1: retry time not reached for any host after a long failure period
-1999-03-02 09:44:33 10HmbB-0005vi-00 Frozen (delivery error message)
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1032
+1999-03-02 09:44:33 10HmbB-0005vi-00 => ph10 <ph10@???> R=r0 T=t2
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local S=267
+1999-03-02 09:44:33 10HmbC-0005vi-00 10.0.0.2 [10.0.0.2]: Connection timed out
+1999-03-02 09:44:33 10HmbC-0005vi-00 == ph10@??? R=r1 T=t1 defer (110): Connection timed out
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmbC-0005vi-00 10.0.0.2 [10.0.0.2]: Connection timed out
+1999-03-02 09:44:33 10HmbC-0005vi-00 == ph10@??? R=r1 T=t1 defer (110): Connection timed out
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** ph10@???: retry timeout exceeded
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=exim P=local S=1032
+1999-03-02 09:44:33 10HmbD-0005vi-00 => ph10 <ph10@???> R=r0 T=t2
+1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= ph10@??? U=ph10 P=local S=267
+1999-03-02 09:44:33 10HmbE-0005vi-00 ** ph10@??? R=r1 T=t1: retry time not reached for any host after a long failure period
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=exim P=local S=1073
+1999-03-02 09:44:33 10HmbF-0005vi-00 => ph10 <ph10@???> R=r0 T=t2
+1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
Index: 580
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/580,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 580 28 Apr 2005 13:06:33 -0000 1.2
+++ 580 29 Jun 2005 14:17:02 -0000 1.3
@@ -1,7 +1,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=256
1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1159
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1041
1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
Index: 581
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/581,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 581 28 Apr 2005 13:06:33 -0000 1.2
+++ 581 29 Jun 2005 14:17:02 -0000 1.3
@@ -3,7 +3,7 @@
1999-03-02 09:44:33 Start queue run: pid=pppp
1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (110): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after end of data (266 bytes written)
1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1014
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1041
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1]: Connection reset by peer
1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=r1 T=t1 defer (104): Connection reset by peer: 127.0.0.1 [127.0.0.1]
Index: 600
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/600,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 600 28 Apr 2005 13:06:33 -0000 1.2
+++ 600 29 Jun 2005 14:17:02 -0000 1.3
@@ -8,7 +8,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.4 [127.0.0.4]: Connection refused
1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1047
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1074
1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <ph10@???> R=r0
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
@@ -21,7 +21,7 @@
1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.2 [127.0.0.2]: Connection refused
1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph10@??? R=r1 T=t1 defer (111): Connection refused
1999-03-02 09:44:33 10HmaZ-0005vi-00 ** ph10@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1047
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1074
1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <ph10@???> R=r0
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
Index: 605
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/605,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 605 28 Apr 2005 13:06:33 -0000 1.2
+++ 605 29 Jun 2005 14:17:02 -0000 1.3
@@ -1,7 +1,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=267
1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 defer (-1): failed to expand "${lookup ldap user="cn=xxx,o=yyy,c=UK" pass=xxxxxxxx ldap:///o=zzz,c=UK,?sn?sub?(cn=foo)}}": missing or misplaced { or }
1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1047
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1074
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=r0 T=t1
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
Index: 608
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/608,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 608 28 Apr 2005 13:06:33 -0000 1.2
+++ 608 29 Jun 2005 14:17:02 -0000 1.3
@@ -2,7 +2,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=r1 T=t1 defer (-32): failed to lookup IP address for non-exist.test.ex
1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph10@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1047
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1074
1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
1999-03-02 09:44:33 10HmaY-0005vi-00 == ph10@??? R=r1 T=t1 defer (-32): failed to lookup IP address for non-exist.test.ex
1999-03-02 09:44:33 10HmaY-0005vi-00 ** ph10@???: retry timeout exceeded
Index: 537.ph10
====================================================================
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Received: from exim by myhost.test.ex with local (Exim x.yz)
id 10HmbB-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
X-Failed-Recipients: ph10@???
Auto-Submitted: auto-generated
From: Mail Delivery System <Mailer-Daemon@???>
To: ph10@???
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmbB-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
This message was created automatically by mail delivery software.
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:
ph10@???
retry timeout exceeded
------ This is a copy of the message, including all the headers. ------
Return-path: <ph10@???>
Received: from ph10 by myhost.test.ex with local (Exim x.yz)
id 10HmbA-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbA-0005vi-00@???>
From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Short message
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Received: from exim by myhost.test.ex with local (Exim x.yz)
id 10HmbD-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
X-Failed-Recipients: ph10@???
Auto-Submitted: auto-generated
From: Mail Delivery System <Mailer-Daemon@???>
To: ph10@???
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmbD-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
This message was created automatically by mail delivery software.
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:
ph10@???
retry timeout exceeded
------ This is a copy of the message, including all the headers. ------
Return-path: <ph10@???>
Received: from ph10 by myhost.test.ex with local (Exim x.yz)
id 10HmbC-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbC-0005vi-00@???>
From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Short message
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Received: from exim by myhost.test.ex with local (Exim x.yz)
id 10HmbF-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
X-Failed-Recipients: ph10@???
Auto-Submitted: auto-generated
From: Mail Delivery System <Mailer-Daemon@???>
To: ph10@???
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmbF-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
This message was created automatically by mail delivery software.
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:
ph10@???
retry time not reached for any host after a long failure period
------ This is a copy of the message, including all the headers. ------
Return-path: <ph10@???>
Received: from ph10 by myhost.test.ex with local (Exim x.yz)
id 10HmbE-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbE-0005vi-00@???>
From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Short message
Index: 079.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/079.ph10,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 079.ph10 28 Apr 2005 13:06:34 -0000 1.2
+++ 079.ph10 29 Jun 2005 14:17:02 -0000 1.3
@@ -179,6 +179,7 @@
recipients. This is a permanent error. The following address(es) failed:
filter-lookup@???
+ retry timeout exceeded
------ This is a copy of the message, including all the headers. ------
@@ -214,6 +215,7 @@
recipients. This is a permanent error. The following address(es) failed:
filter-exists@???
+ retry timeout exceeded
------ This is a copy of the message, including all the headers. ------
@@ -249,6 +251,7 @@
recipients. This is a permanent error. The following address(es) failed:
filter-readfile@???
+ retry timeout exceeded
------ This is a copy of the message, including all the headers. ------
@@ -284,6 +287,7 @@
recipients. This is a permanent error. The following address(es) failed:
filter-run@???
+ retry timeout exceeded
------ This is a copy of the message, including all the headers. ------
@@ -368,6 +372,7 @@
recipients. This is a permanent error. The following address(es) failed:
readfile@???
+ retry timeout exceeded
------ This is a copy of the message, including all the headers. ------
Index: 360.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/360.ph10,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 360.ph10 8 Oct 2004 14:49:42 -0000 1.1
+++ 360.ph10 29 Jun 2005 14:17:02 -0000 1.2
@@ -16,6 +16,6 @@
recipients. This is a permanent error. The following address(es) failed:
abcd@???
- mailbox is full
+ mailbox is full: retry timeout exceeded
Index: 526.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/526.ph10,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 526.ph10 28 Apr 2005 13:06:34 -0000 1.2
+++ 526.ph10 29 Jun 2005 14:17:02 -0000 1.3
@@ -45,6 +45,7 @@
recipients. This is a permanent error. The following address(es) failed:
ph10@???
+ retry timeout exceeded
------ This is a copy of the message, including all the headers. ------
Index: 605.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/605.ph10,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 605.ph10 28 Apr 2005 13:06:34 -0000 1.2
+++ 605.ph10 29 Jun 2005 14:17:02 -0000 1.3
@@ -16,6 +16,7 @@
recipients. This is a permanent error. The following address(es) failed:
ph10@???
+ retry timeout exceeded
------ This is a copy of the message, including all the headers. ------
Index: 580.10HmaY-0005vi-00
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/msglog/580.10HmaY-0005vi-00,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 580.10HmaY-0005vi-00 28 Apr 2005 13:06:34 -0000 1.2
+++ 580.10HmaY-0005vi-00 29 Jun 2005 14:17:02 -0000 1.3
@@ -1,3 +1,3 @@
-1999-03-02 09:44:33 Received from <> R=10HmaX-0005vi-00 U=exim P=local S=1159
+1999-03-02 09:44:33 Received from <> R=10HmaX-0005vi-00 U=exim P=local S=1041
1999-03-02 09:44:33 127.0.0.1 [127.0.0.1]: Connection refused
1999-03-02 09:44:33 ph10@??? R=r1 T=t1 defer (111): Connection refused
Index: 537
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/537,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 537 8 Oct 2004 14:49:53 -0000 1.1
+++ 537 29 Jun 2005 14:17:02 -0000 1.2
@@ -65,4 +65,18 @@
exim -DFALLBACK= -odi ph10@???
Short message
****
+0
+exim -DFALLBACK= -DROUTE_DATA=10.0.0.2 -odi ph10@???
+Short message
+****
+0
+sleep 2
+****
+0
+exim -DFALLBACK= -DROUTE_DATA=10.0.0.2 -q
+****
+0
+exim -DFALLBACK= -DROUTE_DATA=10.0.0.2 -odi ph10@???
+Short message
+****
no_msglog_check
Index: 581
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/581,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 581 22 Jun 2005 14:45:06 -0000 1.7
+++ 581 29 Jun 2005 14:17:02 -0000 1.8
@@ -233,7 +233,7 @@
Writing spool header file
Size of headers = 427
LOG: MAIN
- <= <> R=10HmaX-0005vi-00 U=exim P=local S=1014
+ <= <> R=10HmaX-0005vi-00 U=exim P=local S=1041
search_tidyup called
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -258,7 +258,7 @@
Empty Tree
---- End of tree ----
recipients_count=1
-body_linecount=17 message_linecount=10
+body_linecount=18 message_linecount=10
Delivery address list:
ph10@???
locking /source/exim4/AutoTest/spool/db/retry.lockfile
Index: 600
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/600,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 600 28 Apr 2005 13:06:34 -0000 1.3
+++ 600 29 Jun 2005 14:17:02 -0000 1.4
@@ -74,7 +74,7 @@
trusted user
admin user
LOG: MAIN
- <= <> R=10HmaX-0005vi-00 U=exim P=local S=1047
+ <= <> R=10HmaX-0005vi-00 U=exim P=local S=1074
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz uid=42 gid=42 pid=pppp D=10000000
Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
@@ -148,7 +148,7 @@
trusted user
admin user
LOG: MAIN
- <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1047
+ <= <> R=10HmaZ-0005vi-00 U=exim P=local S=1074
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz uid=42 gid=42 pid=pppp D=10000000
Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
