Merge branch 'exim-4.96+security'

[exim.git] / test / stderr / 0378

diff --git a/test/stderr/0378 b/test/stderr/0378
index 332b81b4d09934fe1e960a02236b684e4033ba7a..845da3cb226f726ec45b67f5af40df90fc24b0f2 100644 (file)
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex 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
@@ -43,12 +41,10 @@ save TESTSUITE/test-mail/file
 pipe "/bin/sh -c exit"
 mail subject autoreply
 text "This is an autoreply"' (tainted)
-local-accept-delivery forking for router-interpret
-local-accept-delivery forked for router-interpret: npppp
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
->>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@myhost.test.ex
@@ -119,17 +115,11 @@ After routing:
   Deferred addresses:
     defer_aaaa@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
-delivery-local forking for autoreply
-delivery-local forked for autoreply: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
-  <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
-autoreply forking for local-accept-delivery
-autoreply forked for local-accept-delivery: npppp
+  <= <> R=10HmaX-000000005vi-0000 U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -163,36 +153,26 @@ After routing:
   Deferred addresses:
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (autoreply) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (autoreply) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => >CALLER@myhost.test.ex <aaaa@myhost.test.ex> R=aaaa T=t3
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
-delivery-local forking for pipe-tpt-cmd
-delivery-local forked for pipe-tpt-cmd: npppp
-delivery-local forking for pipe-tpt-output
-delivery-local forked for pipe-tpt-output: npppp
 transport error EPIPE ignored
 LOG: MAIN
   => |/bin/sh -c exit <aaaa@myhost.test.ex> R=aaaa T=t2
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => TESTSUITE/test-mail/file <aaaa@myhost.test.ex> R=aaaa T=t1
 locking TESTSUITE/spool/db/retry.lockfile
->>>>>>>>>>>>>>>> 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
-fresh-exec forked for qrun-delivery: npppp
+  Start queue run: pid=p1234 -qf
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex
@@ -252,12 +232,10 @@ save TESTSUITE/test-mail/file
 pipe "/bin/sh -c exit"
 mail subject autoreply
 text "This is an autoreply"' (tainted)
-qrun-delivery forking for router-interpret
-qrun-delivery forked for router-interpret: npppp
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
->>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1240 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@myhost.test.ex
@@ -324,7 +302,7 @@ After routing:
   Deferred addresses:
     defer_aaaa@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1241 (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 >>>>>>>>>>>>>>>>