Pipe transport: fix log_defer_output option. Bug 840

[exim.git] / test / log / 0495

diff --git a/test/log/0495 b/test/log/0495
index 20f15c67824450b8601ae62148536658764b76fc..17886a809fc68d1748958a43b8d001560050a93d 100644 (file)
--- a/test/log/0495
+++ b/test/log/0495
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-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 ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused
 1999-03-02 09:44:33 10HmaY-0005vi-00 ** xyz@test.ex 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 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@ -8,16 +8,16 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 -> b@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** a@x.y R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<b@x.y>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@x.y R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<b@x.y>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** a@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@x.y>: 550 NOTOK
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@x.y>: 550 NOTOK
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@x.y R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@x.y R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 550 BAD MAIL
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 550 BAD MAIL
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** a@x.y R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** b@x.y R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** a@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 450 TEMPORARY MAIL FAIL
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** b@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 450 TEMPORARY MAIL FAIL
 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmbD-0005vi-00 => pm@p.q <postmaster@x.y> R=r9 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
@@ -45,14 +45,14 @@
 1999-03-02 09:44:33 10HmbJ-0005vi-00 -> b@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbK-0005vi-00 <= sen@der U=CALLER P=local-esmtp S=sss
-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 ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused
+1999-03-02 09:44:33 10HmbK-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmbK-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused
 1999-03-02 09:44:33 10HmbK-0005vi-00 ** a@x.y R=r9 T=t1: Connection refused
 1999-03-02 09:44:33 10HmbK-0005vi-00 ** b@x.y 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 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** a@x.y R=r9 T=t1: Connection timed out: SMTP timeout while connected to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] after RCPT TO:<b@x.y>
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** b@x.y R=r9 T=t1: Connection timed out: SMTP timeout while connected to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] after RCPT TO:<b@x.y>
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** a@x.y R=r9 T=t1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: Connection timed out: SMTP timeout after RCPT TO:<b@x.y>
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** b@x.y R=r9 T=t1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: Connection timed out: SMTP timeout after RCPT TO:<b@x.y>
 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 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
@@ -61,6 +61,6 @@
 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
 1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbM-0005vi-00 ** a@x.y R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<a@x.y>: host 127.0.0.1 [127.0.0.1]: 550 SORRY
+1999-03-02 09:44:33 10HmbM-0005vi-00 ** a@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@x.y>: 550 SORRY
 1999-03-02 09:44:33 10HmbM-0005vi-00 ** a@x.y mua_wrapper forced failure for deferred delivery
 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed