pass through exec

[exim.git] / test / stderr / 0378

diff --git a/test/stderr/0378 b/test/stderr/0378
index 27632ea09e50db849900d47b3ad39994e3b40eca..3c422c19b8d782e5bec9101eb4019ccbbc83d90e 100644 (file)
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -4,9 +4,9 @@ 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
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+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
@@ -44,13 +44,13 @@ save TESTSUITE/test-mail/file
 pipe "/bin/sh -c exit"
 mail subject autoreply
 text "This is an autoreply"' (tainted)
-fresh-exec forking for router interpret
-postfork: router interpret
+local-accept-delivery forking for router-interpret
+postfork: router-interpret
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
 >>>>>>>>>>>>>>>> Exim pid=pppp (rda) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for router interpret: npppp
+local-accept-delivery forked for router-interpret: npppp
 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@myhost.test.ex
@@ -121,20 +121,20 @@ After routing:
   Deferred addresses:
     defer_aaaa@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-delivery (local) forking for autoreply
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+delivery-local forking for autoreply
 postfork: autoreply
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for autoreply: npppp
+local-accept-delivery forked for delivery-local: npppp
+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
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+autoreply forking for local-accept-delivery
+postfork: local-accept-delivery
+autoreply forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -173,22 +173,22 @@ LOG: MAIN
 LOG: MAIN
   => >CALLER@myhost.test.ex <aaaa@myhost.test.ex> R=aaaa T=t3
 locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-delivery (local) forking for pipe-tpt-cmd
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+delivery-local forking for pipe-tpt-cmd
 postfork: pipe-tpt-cmd
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for pipe-tpt-cmd: npppp
-delivery (local) forking for pipe-transport output
+local-accept-delivery forked for delivery-local: npppp
+delivery-local forked for pipe-tpt-cmd: npppp
+delivery-local forking for pipe-transport output
 postfork: pipe-transport output
-delivery (local) forked for pipe-transport output: npppp
+delivery-local forked for pipe-transport 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
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: 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
@@ -261,14 +261,14 @@ 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
-postfork: router interpret
+qrun delivery forking for router-interpret
+postfork: router-interpret
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
 >>>>>>>>>>>>>>>> Exim pid=pppp (rda) terminating with rc=0 >>>>>>>>>>>>>>>>
 fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for router interpret: npppp
+qrun delivery forked for router-interpret: npppp
 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@myhost.test.ex