pass through exec

1 files changed, 52 insertions, 52 deletions

diff --git a/test/stderr/0374 b/test/stderr/0374
index 80cfecac9..24fc97d50 100644
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -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
@@ -340,106 +340,106 @@ After routing:
   Failed addresses:
   Deferred addresses:
 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
   => a1 <a1@myhost.test.ex> R=real T=real
 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
   => b1 <b1@myhost.test.ex> R=real T=real
 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
   => c1 <c1@myhost.test.ex> R=real T=real
 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
   => d1 <d1@myhost.test.ex> R=real T=real
 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
   => d2 <d2@myhost.test.ex> R=real T=real
 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
   => d3 <d3@myhost.test.ex> R=real T=real
 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
   => a1 <a1@myhost.test.ex> R=u1 T=ut1
 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
   ** b1@myhost.test.ex R=ut2 T=ut2: Child process of ut2 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 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
   == c1@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
-fresh-exec forking for transport
+local-accept-delivery forking for transport
 postfork: transport
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
 LOG: MAIN
   => d1@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
-fresh-exec forking for transport
+local-accept-delivery forking for transport
 postfork: transport
 locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
 LOG: MAIN
   == d2@myhost.test.ex R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: 450 soft error
-fresh-exec forking for transport
+local-accept-delivery forking for transport
 postfork: transport
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
 LOG: MAIN
   ** d3@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
 locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for bounce message
+local-accept-delivery forking for bounce message
 postfork: bounce message
-fresh-exec forked for bounce message: npppp
+local-accept-delivery forked for bounce message: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+bounce message forking for local-accept-delivery
+postfork: local-accept-delivery
+bounce message forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -489,9 +489,9 @@ After routing:
   Failed addresses:
   Deferred addresses:
 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
   => CALLER <CALLER@myhost.test.ex> R=real T=real
 LOG: MAIN