Fix 2-phase, in-order queue run delivery order

[exim.git] / test / log / 0416

diff --git a/test/log/0416 b/test/log/0416
index f8b67d176ffe9181f5b945e3f1e1f94e6687c54d..5b578a0d3fe6287a0cc79a6392420732d4287045 100644 (file)
--- a/test/log/0416
+++ b/test/log/0416
@@ -1,26 +1,26 @@
 1999-03-02 09:44:33 "discard" verb not allowed in EHLO or HELO ACL
 1999-03-02 09:44:33 U=CALLER temporarily rejected EHLO or HELO xxx
 1999-03-02 09:44:33 "discard" verb not allowed in EHLO or HELO ACL
 1999-03-02 09:44:33 U=CALLER temporarily rejected EHLO or HELO xxx

-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for x@y
-1999-03-02 09:44:33 10HmaX-0005vi-00 => blackhole (non-SMTP ACL discarded recipients)
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss for x@y
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => blackhole (non-SMTP ACL discarded recipients)
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed

 1999-03-02 09:44:33 U=CALLER F=<discard@x.y> RCPT <a@b>: discarded by MAIL ACL: discard message 2
 1999-03-02 09:44:33 U=CALLER F=<discard@x.y> RCPT <discard@p.q>: discarded by MAIL ACL: discard message 2
 1999-03-02 09:44:33 U=CALLER F=<discard@x.y> RCPT <a@b>: discarded by MAIL ACL: discard message 2
 1999-03-02 09:44:33 U=CALLER F=<discard@x.y> RCPT <discard@p.q>: discarded by MAIL ACL: discard message 2

-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 => blackhole (MAIL ACL discarded recipients)
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 => blackhole (MAIL ACL discarded recipients)
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed

 1999-03-02 09:44:33 U=CALLER F=<ok@x.y> RCPT <discard@p.q>: discarded by RCPT ACL: discard message 1
 1999-03-02 09:44:33 U=CALLER F=<ok@x.y> RCPT <nested_discard@p.q>: discarded by RCPT ACL
 1999-03-02 09:44:33 U=CALLER F=<ok@x.y> RCPT <discard@p.q>: discarded by RCPT ACL: discard message 1
 1999-03-02 09:44:33 U=CALLER F=<ok@x.y> RCPT <nested_discard@p.q>: discarded by RCPT ACL

-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local-smtp S=sss for a@b
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local-smtp S=sss for a@b

 1999-03-02 09:44:33 U=CALLER F=<ok@x.y> RCPT <discard@p.q>: discarded by RCPT ACL: discard message 1
 1999-03-02 09:44:33 U=CALLER F=<ok@x.y> RCPT <discard@p.q>: discarded by RCPT ACL: discard message 1

-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 => blackhole (RCPT ACL discarded recipients)
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local-smtp S=sss for a@b
-1999-03-02 09:44:33 10HmbB-0005vi-00 => blackhole (DATA ACL discarded recipients)
-1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@test.ex U=CALLER P=local-smtp S=sss for data_message_discard@b
-1999-03-02 09:44:33 10HmbC-0005vi-00 => blackhole (DATA ACL discarded recipients): discard message 3
-1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for data_message_discard@y
-1999-03-02 09:44:33 10HmbD-0005vi-00 => blackhole (non-SMTP ACL discarded recipients): discard message 4
-1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 => blackhole (RCPT ACL discarded recipients)
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local-smtp S=sss for a@b
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 => blackhole (DATA ACL discarded recipients)
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local-smtp S=sss for data_message_discard@b
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 => blackhole (DATA ACL discarded recipients): discard message 3
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss for data_message_discard@y
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 => blackhole (non-SMTP ACL discarded recipients): discard message 4
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 Completed