ph10 2005/06/28 11:23:36 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src deliver.c exim.c log.c
exim-test-orig/AutoTest/confs 578
exim-test-orig/AutoTest/log 578
exim-test-orig/AutoTest/paniclog 578
exim-test-orig/AutoTest/scripts 578
exim-test-orig/AutoTest/stderr 578
exim-test-orig/AutoTest/stdout 578
Log:
Fix mua_wrapper defers not turning into fails for problems such as
malformed smtp transport configurations.
Revision Changes Path
1.177 +7 -0 exim/exim-doc/doc-txt/ChangeLog
1.21 +20 -2 exim/exim-src/src/deliver.c
1.22 +8 -3 exim/exim-src/src/exim.c
1.6 +2 -2 exim/exim-src/src/log.c
1.2 +10 -0 exim/exim-test-orig/AutoTest/confs/578
1.4 +48 -42 exim/exim-test-orig/AutoTest/log/578
1.2 +2 -0 exim/exim-test-orig/AutoTest/paniclog/578
1.2 +4 -0 exim/exim-test-orig/AutoTest/scripts/578
1.3 +2 -1 exim/exim-test-orig/AutoTest/stderr/578
1.3 +8 -8 exim/exim-test-orig/AutoTest/stdout/578
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- ChangeLog 28 Jun 2005 08:49:38 -0000 1.176
+++ ChangeLog 28 Jun 2005 10:23:35 -0000 1.177
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.176 2005/06/28 08:49:38 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.177 2005/06/28 10:23:35 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -224,6 +224,13 @@
precedence over the domain-wide flag.
TK/12 Cleared some compiler warnings related to SPF, SRS and DK code.
+
+PH/32 In mua_wrapper mode, if an smtp transport configuration error (such as
+ the use of a port name that isn't defined in /etc/services) occurred, the
+ message was deferred as in a normal delivery, and thus remained on the
+ spool, instead of being failed because of the mua_wrapper setting. This
+ is now fixed, and I tidied up some of the mua_wrapper messages at the
+ same time.
Exim version 4.51
Index: deliver.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/deliver.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- deliver.c 27 Jun 2005 14:29:43 -0000 1.20
+++ deliver.c 28 Jun 2005 10:23:35 -0000 1.21
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/deliver.c,v 1.20 2005/06/27 14:29:43 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/deliver.c,v 1.21 2005/06/28 10:23:35 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -5952,11 +5952,29 @@
signal(SIGTERM, SIG_IGN);
/* When we are acting as an MUA wrapper, the smtp transport will either have
-succeeded for all addresses, or failed them all. We do not ever want to retry,
-nor do we want to send a bounce message. */
+succeeded for all addresses, or failed them all in normal cases. However, there
+are some setup situations (e.g. when a named port does not exist) that cause an
+immediate exit with deferral of all addresses. Convert those into failures. We
+do not ever want to retry, nor do we want to send a bounce message. */
if (mua_wrapper)
{
+ if (addr_defer != NULL)
+ {
+ address_item *addr, *nextaddr;
+ for (addr = addr_defer; addr != NULL; addr = nextaddr)
+ {
+ log_write(0, LOG_MAIN, "** %s mua_wrapper forced failure for deferred "
+ "delivery", addr->address);
+ nextaddr = addr->next;
+ addr->next = addr_failed;
+ addr_failed = addr;
+ }
+ addr_defer = NULL;
+ }
+
+ /* Now all should either have succeeded or failed. */
+
if (addr_failed == NULL) final_yield = DELIVER_MUA_SUCCEEDED; else
{
uschar *s = (addr_failed->user_message != NULL)?
Index: exim.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exim.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- exim.c 27 Jun 2005 14:29:04 -0000 1.21
+++ exim.c 28 Jun 2005 10:23:35 -0000 1.22
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/exim.c,v 1.21 2005/06/27 14:29:04 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/exim.c,v 1.22 2005/06/28 10:23:35 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -3939,12 +3939,17 @@
/* Run in daemon and/or queue-running mode. The function daemon_go() never
returns. We leave this till here so that the originator_ fields are available
-for incoming messages via the daemon. */
+for incoming messages via the daemon. The daemon cannot be run in mua_wrapper
+mode. */
if (daemon_listen || queue_interval > 0)
{
- if (mua_wrapper) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Daemon cannot be "
- "run when mua_wrapper is set");
+ if (mua_wrapper)
+ {
+ fprintf(stderr, "Daemon cannot be run when mua_wrapper is set\n");
+ log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Daemon cannot be run when "
+ "mua_wrapper is set");
+ }
daemon_go();
}
Index: log.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/log.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- log.c 27 Jun 2005 14:29:43 -0000 1.5
+++ log.c 28 Jun 2005 10:23:35 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/log.c,v 1.5 2005/06/27 14:29:43 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/log.c,v 1.6 2005/06/28 10:23:35 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -997,11 +997,11 @@
/* Handle the panic log, which is not kept open like the others. If it fails to
open, there will be a recursive call to log_write(). We detect this above and
attempt to write to the system log as a last-ditch try at telling somebody. In
-all cases, try to write to log_stderr. */
+all cases except mua_wrapper, try to write to log_stderr. */
if ((flags & LOG_PANIC) != 0)
{
- if (log_stderr != NULL && log_stderr != debug_file)
+ if (log_stderr != NULL && log_stderr != debug_file && !mua_wrapper)
fprintf(log_stderr, "%s", CS log_buffer);
if ((logging_mode & LOG_MODE_SYSLOG) != 0)
Index: 578
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/578,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 578 8 Oct 2004 14:49:16 -0000 1.1
+++ 578 28 Jun 2005 10:23:35 -0000 1.2
@@ -48,6 +48,11 @@
driver = accept
local_parts = otherhost
transport = t2
+
+r3:
+ driver = accept
+ local_parts = ^badport
+ transport = t4
r9:
driver = accept
@@ -74,5 +79,10 @@
t3:
driver = appendfile
file = DIR/test-mail/$local_part
+
+t4:
+ driver = smtp
+ hosts = 10.10.10.10
+ port = nonexistent
# End of Exim 4 configuration
Index: 578
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/578,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 578 17 May 2005 15:00:04 -0000 1.3
+++ 578 28 Jun 2005 10:23:35 -0000 1.4
@@ -1,56 +1,62 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=301
-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 ::1 [::1]: Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** xyz@??? R=r9 T=t1: Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=262
-1999-03-02 09:44:33 10HmaY-0005vi-00 => a@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
-1999-03-02 09:44:33 10HmaY-0005vi-00 -> b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=301
+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 ::1 [::1]: Connection refused
+1999-03-02 09:44:33 10HmaY-0005vi-00 ** xyz@??? R=r9 T=t1: Connection refused
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=291
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=262
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => a@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
+1999-03-02 09:44:33 10HmaZ-0005vi-00 -> b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local S=282
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local S=291
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local S=305
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local S=282
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local S=288
-1999-03-02 09:44:33 10HmbC-0005vi-00 => pm@??? <postmaster@???> R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
-1999-03-02 09:44:33 10HmbC-0005vi-00 -> b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local S=305
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= ph10@??? U=ph10 P=local S=292
-1999-03-02 09:44:33 10HmbD-0005vi-00 ** file@??? routing yielded a local delivery
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= ph10@??? U=ph10 P=local S=288
+1999-03-02 09:44:33 10HmbD-0005vi-00 => pm@??? <postmaster@???> R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
+1999-03-02 09:44:33 10HmbD-0005vi-00 -> b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= ph10@??? U=ph10 P=local S=282
-1999-03-02 09:44:33 10HmbE-0005vi-00 ** fail@??? R=r1: forcible fail message
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= ph10@??? U=ph10 P=local S=292
+1999-03-02 09:44:33 10HmbE-0005vi-00 ** file@??? routing yielded a local delivery
1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbF-0005vi-00 <= ph10@??? U=ph10 P=local S=283
-1999-03-02 09:44:33 10HmbF-0005vi-00 == defer@??? R=r1 defer (-1): forcible defer message
-1999-03-02 09:44:33 10HmbF-0005vi-00 ** defer@??? routing yielded a deferred delivery
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= ph10@??? U=ph10 P=local S=282
+1999-03-02 09:44:33 10HmbF-0005vi-00 ** fail@??? R=r1: forcible fail message
1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbG-0005vi-00 <= ph10@??? U=ph10 P=local S=294
-1999-03-02 09:44:33 10HmbG-0005vi-00 ** mua_wrapper is set but recipients cannot all be delivered in one transaction
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= ph10@??? U=ph10 P=local S=283
+1999-03-02 09:44:33 10HmbG-0005vi-00 == defer@??? R=r1 defer (-1): forcible defer message
+1999-03-02 09:44:33 10HmbG-0005vi-00 ** defer@??? routing yielded a deferred delivery
1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbH-0005vi-00 <= ph10@??? U=ph10 P=local S=290
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= ph10@??? U=ph10 P=local S=294
1999-03-02 09:44:33 10HmbH-0005vi-00 ** mua_wrapper is set but recipients cannot all be delivered in one transaction
1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
-1999-03-02 09:44:33 Daemon cannot be run when mua_wrapper is set
-1999-03-02 09:44:33 10HmbI-0005vi-00 <= sen@der U=ph10 P=local-esmtp S=269
-1999-03-02 09:44:33 10HmbI-0005vi-00 => a@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
-1999-03-02 09:44:33 10HmbI-0005vi-00 -> b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= ph10@??? U=ph10 P=local S=290
+1999-03-02 09:44:33 10HmbI-0005vi-00 ** mua_wrapper is set but recipients cannot all be delivered in one transaction
1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbJ-0005vi-00 <= sen@der U=ph10 P=local-esmtp S=285
-1999-03-02 09:44:33 10HmbJ-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
-1999-03-02 09:44:33 10HmbJ-0005vi-00 ::1 [::1]: Connection refused
-1999-03-02 09:44:33 10HmbJ-0005vi-00 ** a@??? R=r9 T=t1: Connection refused
-1999-03-02 09:44:33 10HmbJ-0005vi-00 ** b@??? R=r9 T=t1: Connection refused
+1999-03-02 09:44:33 Daemon cannot be run when mua_wrapper is set
+1999-03-02 09:44:33 10HmbJ-0005vi-00 <= sen@der U=ph10 P=local-esmtp S=269
+1999-03-02 09:44:33 10HmbJ-0005vi-00 => a@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
+1999-03-02 09:44:33 10HmbJ-0005vi-00 -> b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbK-0005vi-00 <= ph10@??? U=ph10 P=local S=279
-1999-03-02 09:44:33 10HmbK-0005vi-00 ** a@??? R=r9 T=t1: Connection timed out: SMTP timeout while connected to ::1 [::1] after RCPT TO:<b@???>
-1999-03-02 09:44:33 10HmbK-0005vi-00 ** b@??? R=r9 T=t1: Connection timed out: SMTP timeout while connected to ::1 [::1] after RCPT TO:<b@???>
+1999-03-02 09:44:33 10HmbK-0005vi-00 <= sen@der U=ph10 P=local-esmtp S=285
+1999-03-02 09:44:33 10HmbK-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
+1999-03-02 09:44:33 10HmbK-0005vi-00 ::1 [::1]: Connection refused
+1999-03-02 09:44:33 10HmbK-0005vi-00 ** a@??? R=r9 T=t1: Connection refused
+1999-03-02 09:44:33 10HmbK-0005vi-00 ** b@??? R=r9 T=t1: Connection refused
1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbL-0005vi-00 <= ph10@??? U=ph10 P=local S=279
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** a@??? R=r9 T=t1: Connection timed out: SMTP timeout while connected to ::1 [::1] after RCPT TO:<b@???>
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** b@??? R=r9 T=t1: Connection timed out: SMTP timeout while connected to ::1 [::1] after RCPT TO:<b@???>
+1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=293
+1999-03-02 09:44:33 10HmaX-0005vi-00 == badport1@z R=r3 T=t4 defer (-1): TCP port "nonexistent" is not defined for t4 transport
+1999-03-02 09:44:33 10HmaX-0005vi-00 == badport2@z R=r3 T=t4 defer (-1): TCP port "nonexistent" is not defined for t4 transport
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** badport2@z mua_wrapper forced failure for deferred delivery
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** badport1@z mua_wrapper forced failure for deferred delivery
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
Index: 578
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/paniclog/578,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 578 8 Oct 2004 14:49:50 -0000 1.1
+++ 578 28 Jun 2005 10:23:35 -0000 1.2
@@ -1 +1,3 @@
1999-03-02 09:44:33 Daemon cannot be run when mua_wrapper is set
+1999-03-02 09:44:33 10HmaX-0005vi-00 == badport1@z R=r3 T=t4 defer (-1): TCP port "nonexistent" is not defined for t4 transport
+1999-03-02 09:44:33 10HmaX-0005vi-00 == badport2@z R=r3 T=t4 defer (-1): TCP port "nonexistent" is not defined for t4 transport
Index: 578
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/578,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 578 8 Oct 2004 14:49:53 -0000 1.1
+++ 578 28 Jun 2005 10:23:35 -0000 1.2
@@ -202,4 +202,8 @@
.
quit
****
+1
+exim badport1@z badport2@z
+This should fail because of a bad port definition.
+****
no_msglog_check
Index: 578
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/578,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 578 28 Apr 2005 13:06:34 -0000 1.2
+++ 578 28 Jun 2005 10:23:36 -0000 1.3
@@ -7,6 +7,7 @@
routing defer@??? yielded a deferred delivery: forcible defer message
delivery to smarthost failed (configuration problem)
delivery to smarthost failed (configuration problem)
-1999-03-02 09:44:33 Daemon cannot be run when mua_wrapper is set
+Daemon cannot be run when mua_wrapper is set
Delivery failed: Connection refused
Delivery failed: Connection timed out: SMTP timeout while connected to ::1 [::1] after RCPT TO:<b@???>
+Delivery failed: TCP port "nonexistent" is not defined for t4 transport
Index: 578
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/578,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 578 17 May 2005 15:00:05 -0000 1.2
+++ 578 28 Jun 2005 10:23:36 -0000 1.3
@@ -7,7 +7,7 @@
250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbI-0005vi-00
+250 OK id=10HmbJ-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello ph10 at a.b
@@ -18,7 +18,7 @@
250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbJ-0005vi-00
+250 OK id=10HmbK-0005vi-00
******** SERVER ********
Listening on port 1225 ...
@@ -37,8 +37,8 @@
DATA
354 OK
Received: from ph10 by myhost.test.ex with local (Exim x.yz)
- id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@???>
+ id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@???>
From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -110,8 +110,8 @@
DATA
354 OK
Received: from ph10 by myhost.test.ex with local (Exim x.yz)
- id 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@???>
+ id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbD-0005vi-00@???>
From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -136,8 +136,8 @@
354 OK
Received: from ph10 (helo=a.b)
by myhost.test.ex with local-esmtp (Exim x.yz)
- id 10HmbI-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbI-0005vi-00@???>
+ id 10HmbJ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbJ-0005vi-00@???>
From: Philip Hazel <sen@der>
Date: Tue, 2 Mar 1999 09:44:33 +0000
