X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/f3ebb786e451da973560f1c9d8cdb151d25108b5..af8a610f0b90ae66f32b7c6ec31381bdd8457b59:/test/stderr/0360?ds=sidebyside

diff --git a/test/stderr/0360 b/test/stderr/0360
index de4b4f2b6..c3e9a33b8 100644
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -9,7 +9,7 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-delivering 10HmaX-0005vi-00
+delivering 10HmaX-000000005vi-0000
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -46,7 +46,7 @@ v0 router called for postmaster@test.ex
 queued for <unset> transport: local_part = postmaster
 domain = test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=postmaster
 routed by v0 router
   envelope to: postmaster@test.ex
   transport: <none>
@@ -100,10 +100,13 @@ v0 router skipped: verify_only set
 --------> r1 router <--------
 local_part=unknown domain=recurse.test.ex
 checking domains
+recurse.test.ex in domains? yes (end of list)
 calling r1 router
 r1 router called for unknown@recurse.test.ex
   domain = recurse.test.ex
+main lookup for domain
 r1 router widened recurse.test.ex to recurse.test.ex.test.ex
+main lookup for domain
 domain changed to recurse.test.ex.test.ex
 rewriting header lines
 re-routed to unknown@recurse.test.ex.test.ex
@@ -121,14 +124,16 @@ v0 router skipped: verify_only set
 --------> r1 router <--------
 local_part=unknown domain=recurse.test.ex.test.ex
 checking domains
+recurse.test.ex.test.ex in domains? yes (end of list)
 calling r1 router
 r1 router called for unknown@recurse.test.ex.test.ex
   domain = recurse.test.ex.test.ex
+main lookup for domain
 set transport t1
 queued for t1 transport: local_part = unknown
 domain = recurse.test.ex.test.ex
   errors_to=postmaster@test.ex
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r1 router
   envelope to: unknown@recurse.test.ex.test.ex
   transport: t1
@@ -145,14 +150,14 @@ After routing:
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   *> unknown@recurse.test.ex.test.ex <cms@test.ex> R=r1 T=t1 H=recurse.test.ex.test.ex [V4NET.99.0.2] C="delivery bypassed by -N option"
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
-  Start queue run: pid=pppp -qf
+  Start queue run: pid=p1234 -qf
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -189,7 +194,7 @@ v0 router called for postmaster@test.ex
 queued for <unset> transport: local_part = postmaster
 domain = test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=postmaster
 routed by v0 router
   envelope to: postmaster@test.ex
   transport: <none>
@@ -242,6 +247,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer@test.ex
+>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
-  End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+  End queue run: pid=p1234 -qf
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>