debug tidying

[exim.git] / test / stderr / 0315

diff --git a/test/stderr/0315 b/test/stderr/0315
index 01922fbe5ef28952a74f617907c715d109e77bcf..ac9ce9a8a5fade9c6d730875e7f5a5c353da9259 100644 (file)
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -4,10 +4,14 @@ 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
+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
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
@@ -27,6 +31,15 @@ checking domains
 calling r1 router
 r1 router called for y@ten-1.test.ex
   domain = ten-1.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
 set transport t1
 queued for t1 transport: local_part = y
 domain = ten-1.test.ex
@@ -47,24 +60,31 @@ After routing:
     y@ten-1.test.ex
   Failed addresses:
   Deferred addresses:
+local-accept-delivery forking for transport
+postfork: 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]
+  *> 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]
+  *> 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 terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) 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
+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 10HmaY-0005vi-00
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
@@ -87,6 +107,15 @@ local_part=y domain=ten-2.test.ex
 calling r2 router
 r2 router called for y@ten-2.test.ex
   domain = ten-2.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
 set transport t1
 queued for t1 transport: local_part = y
 domain = ten-2.test.ex
@@ -107,6 +136,9 @@ local_part=x domain=ten-2.test.ex
 calling r2 router
 r2 router called for x@ten-2.test.ex
   domain = ten-2.test.ex
+local-accept-delivery forking for fakens-search
+postfork: fakens-search
+local-accept-delivery forked for fakens-search: npppp
 queued for t1 transport: local_part = x
 domain = ten-2.test.ex
   errors_to=NULL
@@ -123,12 +155,15 @@ After routing:
     y@ten-2.test.ex
   Failed addresses:
   Deferred addresses:
+local-accept-delivery forking for transport
+postfork: 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]
+  *> 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]
+  *> 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 terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>