Copyright updates:

[exim.git] / test / stderr / 0360

diff --git a/test/stderr/0360 b/test/stderr/0360
index 2d7e6aa652aef872126f64b4aa613737d4e96f56..7e30058bc21f809b02b11875ce1d2fc9b2203e77 100644 (file)
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -4,15 +4,12 @@ admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept-delivery
-postfork: 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
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -49,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>
@@ -106,19 +103,7 @@ checking domains
 calling r1 router
 r1 router called for unknown@recurse.test.ex
   domain = recurse.test.ex
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
 r1 router widened recurse.test.ex to recurse.test.ex.test.ex
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
 domain changed to recurse.test.ex.test.ex
 rewriting header lines
 re-routed to unknown@recurse.test.ex.test.ex
@@ -139,14 +124,11 @@ checking domains
 calling r1 router
 r1 router called for unknown@recurse.test.ex.test.ex
   domain = recurse.test.ex.test.ex
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
 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
@@ -160,22 +142,17 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer@test.ex
-local-accept-delivery forking for transport
-postfork: transport
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forked for transport: npppp
 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 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) 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
-fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+  Start queue run: pid=p1234 -qf
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -212,7 +189,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>
@@ -265,8 +242,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer@test.ex
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun-delivery: npppp
+>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
-  End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+  End queue run: pid=p1234 -qf
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>