pass through exec

[users/heiko/exim.git] / test / stderr / 0393

diff --git a/test/stderr/0393 b/test/stderr/0393
index b75199466a3010727e4aad952ec9ad6f1c0e6129..d9938f9232c8ea11069d43c2bb752caae5617977 100644 (file)
--- a/test/stderr/0393
+++ b/test/stderr/0393
@@ -4,9 +4,9 @@ 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
+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
@@ -14,8 +14,8 @@ admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
 direct command:
   argv[0] = '/bin/cat'
 direct command after expansion:
@@ -33,17 +33,17 @@ lock file created
 mailbox TESTSUITE/test-mail/userx is locked
 writing to file TESTSUITE/test-mail/userx
 writing data block fd=dddd size=sss timeout=0
-delivery (local) forking for transport-filter
+delivery-local forking for transport-filter
 postfork: transport-filter
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for transport-filter: npppp
+local-accept-delivery forked for delivery-local: npppp
+delivery-local forked for transport-filter: npppp
 process pppp running as transport filter: fd_write=dddd fd_read=dddd
-delivery (local) forking for transport filter writer
+delivery-local forking for transport filter writer
 postfork: transport filter writer
 cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=0
 >>>>>>>>>>>>>>>> Exim pid=pppp (tpt-filter writer) terminating with rc=0 >>>>>>>>>>>>>>>>
-delivery (local) forked for transport filter writer: npppp
+delivery-local forked for transport filter writer: npppp
 process pppp writing to transport filter
 copying from the filter
 waiting for filter process
@@ -64,9 +64,9 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@test.ex 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
+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
@@ -74,8 +74,8 @@ admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
 direct command:
 direct command after expansion:
 appendfile transport entered
@@ -95,7 +95,7 @@ cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
 t1 transport returned OK for userx@test.ex
 LOG: MAIN
   => userx <userx@test.ex> R=r1 T=t1
@@ -108,9 +108,9 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@test.ex 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
+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
@@ -118,8 +118,8 @@ admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
 direct command:
   argv[0] = '${if={1}{1}{}{}}'
 direct command after expansion:
@@ -141,7 +141,7 @@ cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
 t1 transport returned OK for userx@test.ex
 LOG: MAIN
   => userx <userx@test.ex> R=r1 T=t1