X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ef8ef6c168a552e61ecde1d8d2cd816f2e87614b..2484c35c5deec375307bd4f51aa89ae5080a4e56:/test/stderr/0315?ds=sidebyside

diff --git a/test/stderr/0315 b/test/stderr/0315
index 155fb4dd0..4dc506af4 100644
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -4,14 +4,12 @@ admin user
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept-delivery
-fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 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
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -34,7 +32,7 @@ set transport t1
 queued for t1 transport: local_part = y
 domain = ten-1.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=ten-1.test.ex local_part_data=NULL
 routed by r1 router
   envelope to: y@ten-1.test.ex
   transport: t1
@@ -50,30 +48,26 @@ After routing:
     y@ten-1.test.ex
   Failed addresses:
   Deferred addresses:
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   *> x@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   *> y@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
-fresh-exec forking for local-accept-delivery
-fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-delivering 10HmaY-0005vi-00
+delivering 10HmaY-000000005vi-0000
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -99,7 +93,7 @@ set transport t1
 queued for t1 transport: local_part = y
 domain = ten-2.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r2 router
   envelope to: y@ten-2.test.ex
   transport: t1
@@ -118,7 +112,7 @@ r2 router called for x@ten-2.test.ex
 queued for t1 transport: local_part = x
 domain = ten-2.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r2 router
   envelope to: x@ten-2.test.ex
   transport: t1
@@ -131,14 +125,12 @@ After routing:
     y@ten-2.test.ex
   Failed addresses:
   Deferred addresses:
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   *> x@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
   *> y@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>