Testsuite: munge for error message sizes in retry records

[exim.git] / test / log / 0023

diff --git a/test/log/0023 b/test/log/0023
index 3ea6e2f46371349d66c082feaaa09cc8cfb0a80a..96540424c8f18c4c803f014813d47e6a7a34b146 100644 (file)
--- a/test/log/0023
+++ b/test/log/0023
@@ -1,61 +1,61 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(test) [32.32.32.32] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx-vs <userx-vs@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(test) [32.32.32.32] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@test.ex H=(test) [55.55.55.55] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 => cond-yes <cond-yes@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 => cond-1 <cond-1@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 => cond-10 <cond-10@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 => cond-true <cond-true@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= userx@test.ex H=(test) [32.32.32.32] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => userx-vs <userx-vs@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= userx@test.ex H=(test) [32.32.32.32] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 => userx <userx@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= userx@test.ex H=(test) [55.55.55.55] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 => userx <userx@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 => cond-yes <cond-yes@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 => cond-1 <cond-1@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 => cond-10 <cond-10@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 => cond-true <cond-true@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 Completed

 1999-03-02 09:44:33 H=(test) [56.56.56.56] U=CALLER Warning: ACL "warn" statement skipped: condition test deferred: invalid "condition" value "rhubarb"
 1999-03-02 09:44:33 H=(test) [56.56.56.56] U=CALLER Warning: ACL "warn" statement skipped: condition test deferred: invalid "condition" value "rhubarb"

-1999-03-02 09:44:33 10HmbE-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbE-0005vi-00 => cond-rhubarb <cond-rhubarb@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbF-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbF-0005vi-00 => cond- <cond-@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbG-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbG-0005vi-00 => cond-no <cond-no@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbH-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbH-0005vi-00 => cond-0 <cond-0@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbI-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbI-0005vi-00 => cond-00 <cond-00@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbJ-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbJ-0005vi-00 => cond-false <cond-false@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbK-0005vi-00 <= userx@test.ex H=(test) [56.56.57.57] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbK-0005vi-00 => cond-yes <cond-yes@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbE-000000005vi-0000 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbE-000000005vi-0000 => cond-rhubarb <cond-rhubarb@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbE-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbF-000000005vi-0000 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbF-000000005vi-0000 => cond- <cond-@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbF-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbG-000000005vi-0000 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbG-000000005vi-0000 => cond-no <cond-no@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbG-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbH-000000005vi-0000 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbH-000000005vi-0000 => cond-0 <cond-0@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbH-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbI-000000005vi-0000 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbI-000000005vi-0000 => cond-00 <cond-00@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbI-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbJ-000000005vi-0000 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbJ-000000005vi-0000 => cond-false <cond-false@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbJ-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbK-000000005vi-0000 <= userx@test.ex H=(test) [56.56.57.57] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbK-000000005vi-0000 => cond-yes <cond-yes@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbK-000000005vi-0000 Completed

 1999-03-02 09:44:33 H=(test) [56.56.57.57] U=CALLER F=<userx@test.ex> temporarily rejected RCPT <cond-rhubarb@test.ex>: invalid "condition" value "rhubarb"
 1999-03-02 09:44:33 H=(test) [56.56.57.57] U=CALLER F=<userx@test.ex> temporarily rejected RCPT <cond-rhubarb@test.ex>: invalid "condition" value "rhubarb"

-1999-03-02 09:44:33 10HmbL-0005vi-00 <= userx@test.ex H=(test) [56.56.57.57] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbL-0005vi-00 => cond--1 <cond--1@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbM-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbM-0005vi-00 => cond-rhubarb <cond-rhubarb@test.ex> R=r1 T=t1
-1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbL-000000005vi-0000 <= userx@test.ex H=(test) [56.56.57.57] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbL-000000005vi-0000 => cond--1 <cond--1@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbL-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbM-000000005vi-0000 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbM-000000005vi-0000 => cond-rhubarb <cond-rhubarb@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbM-000000005vi-0000 Completed

 1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad1@test.ex>
 1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad2@test.ex>
 1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad3@test.ex>
 1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad1@test.ex>
 1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad2@test.ex>
 1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad3@test.ex>

-1999-03-02 09:44:33 10HmbN-0005vi-00 <= rcpttest@test.ex H=(test) [56.56.58.58] U=CALLER P=smtp S=sss
-1999-03-02 09:44:33 10HmbN-0005vi-00 => ok1 <ok1@test.ex> R=r0 T=t2
-1999-03-02 09:44:33 10HmbN-0005vi-00 -> ok2 <ok2@test.ex> R=r0 T=t2
-1999-03-02 09:44:33 10HmbN-0005vi-00 -> ok3 <ok3@test.ex> R=r0 T=t2
-1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbN-000000005vi-0000 <= rcpttest@test.ex H=(test) [56.56.58.58] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbN-000000005vi-0000 => ok1 <ok1@test.ex> R=r0 T=t2
+1999-03-02 09:44:33 10HmbN-000000005vi-0000 -> ok2 <ok2@test.ex> R=r0 T=t2
+1999-03-02 09:44:33 10HmbN-000000005vi-0000 -> ok3 <ok3@test.ex> R=r0 T=t2
+1999-03-02 09:44:33 10HmbN-000000005vi-0000 Completed

 1999-03-02 09:44:33 H=(test) [56.56.59.59] U=CALLER F=<rcpttest@test.ex> rejected RCPT <fail@test.ex>: here is a fail message
 1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
 1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
 1999-03-02 09:44:33 H=(test) [56.56.59.59] U=CALLER F=<rcpttest@test.ex> rejected RCPT <fail@test.ex>: here is a fail message
 1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
 1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)