X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6d7c6175eda3aaa316d1960a89170a285510ad40..fed38d88886d069738a444110f10b0c60d867ac0:/test/stderr/0055?ds=sidebyside

diff --git a/test/stderr/0055 b/test/stderr/0055
index c9729ad2e..6f20ee130 100644
--- a/test/stderr/0055
+++ b/test/stderr/0055
@@ -1,11 +1,11 @@
 LOG: MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
-delivering 10HmaX-0005vi-00
+delivering 10HmaX-000000005vi-0000
 LOG: MAIN
   ** xxx@unknown.test.ex: unknown.test.ex is not local, and can't route by DNS
 LOG: MAIN
-  <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-delivering 10HmaY-0005vi-00
+  <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
+delivering 10HmaY-000000005vi-0000
 LOG: MAIN
   *> CALLER <CALLER@myhost.ex> R=localuser T=local_delivery
 LOG: MAIN
@@ -14,62 +14,62 @@ LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
-delivering 10HmaZ-0005vi-00
+delivering 10HmaZ-000000005vi-0000
 LOG: retry_defer MAIN
-  == xxx@local.test.ex routing defer (-55): domain is in queue_domains
+  == xxx@local.test.ex routing defer (-56): domain is in queue_domains
 LOG: MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
-delivering 10HmbB-0005vi-00
+delivering 10HmbB-000000005vi-0000
 LOG: MAIN
   *> xxx@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
-delivering 10HmbC-0005vi-00
+delivering 10HmbC-000000005vi-0000
 LOG: MAIN
-  == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set
+  == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue
 LOG: queue_run MAIN
-  Start queue run: pid=pppp
-delivering 10HmbC-0005vi-00 (queue run pid ppppp)
+  Start queue run: pid=p1236
+delivering 10HmbC-000000005vi-0000 (queue run pid p1236)
 LOG: MAIN
   *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: queue_run MAIN
-  End queue run: pid=pppp
+  End queue run: pid=p1236
 LOG: queue_run MAIN
-  Start queue run: pid=pppp -qq
-delivering 10HmbD-0005vi-00 (queue run pid ppppp)
-delivering 10HmbE-0005vi-00 (queue run pid ppppp)
-delivering 10HmbD-0005vi-00 (queue run pid ppppp)
+  Start queue run: pid=p1237 -qq
+delivering 10HmbD-000000005vi-0000 (queue run pid p1237)
+delivering 10HmbE-000000005vi-0000 (queue run pid p1237)
+delivering 10HmbD-000000005vi-0000 (queue run pid p1237)
 LOG: MAIN
   *> xxx@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
-delivering 10HmbE-0005vi-00 (queue run pid ppppp)
+delivering 10HmbE-000000005vi-0000 (queue run pid p1237)
 LOG: MAIN
   *> yyy@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: queue_run MAIN
-  End queue run: pid=pppp -qq
+  End queue run: pid=p1237 -qq
 LOG: MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
-delivering 10HmbF-0005vi-00
+delivering 10HmbF-000000005vi-0000
 LOG: MAIN
-  == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set
-delivering 10HmbF-0005vi-00
+  == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue
+delivering 10HmbF-000000005vi-0000
 LOG: MAIN
   *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
-delivering 10HmbG-0005vi-00
+delivering 10HmbG-000000005vi-0000
 LOG: retry_defer MAIN
-  == xxx@local.test.ex routing defer (-55): domain is in queue_domains
-delivering 10HmbG-0005vi-00
+  == xxx@local.test.ex routing defer (-56): domain is in queue_domains
+delivering 10HmbG-000000005vi-0000
 LOG: MAIN
   *> xxx@local.test.ex R=localreally T=local_delivery
 LOG: MAIN