Cutthrough: handle request when a callout-hold is active. Bug 2604

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

diff --git a/test/stderr/0283 b/test/stderr/0283
index cc345b1bcd7932143ebe9f3be85531779211e727..0b05aa339281b953e86a53ff7822a1fa1ea9f5bb 100644 (file)
--- a/test/stderr/0283
+++ b/test/stderr/0283
@@ -14,9 +14,6 @@ getpwnam() succeeded uid=uuuu gid=gggg
 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
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
@@ -30,25 +27,13 @@ seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
 changed uid/gid: local delivery to somebody <somebody@myhost.test.ex> transport=t1
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-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
-postfork: pipe-transport output
-delivery (local) forked for pipe-transport output: npppp
 transport error EPIPE ignored
 LOG: MAIN
   ** somebody@myhost.test.ex R=rest T=t1: return message generated
 changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-fresh-exec forking for bounce message
-postfork: bounce message
-fresh-exec forked for bounce message: npppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
@@ -65,9 +50,6 @@ seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
 LOG: MAIN
   <= <> R=10HmaY-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
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
@@ -81,23 +63,20 @@ seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
 changed uid/gid: local delivery to CALLER <CALLER@myhost.test.ex> transport=t2
   uid=CALLER_UID gid=CALLER_GID pid=pppp
-fresh-exec forked for delivery (local): npppp
 LOG: MAIN
   => CALLER <CALLER@myhost.test.ex> R=caller T=t2
 changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
@@ -113,9 +92,6 @@ seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
 LOG: MAIN
   <= CALLER@myhost.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
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
@@ -131,12 +107,9 @@ seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
 LOG: MAIN PANIC
   User 0 set for t3 transport is on the never_users list
-fresh-exec forking for logfile create
-postfork: logfile create
-fresh-exec forked for logfile create: npppp
 LOG: MAIN
   == never@myhost.test.ex R=never T=t3 defer (-29): User 0 set for t3 transport is on the never_users list
 changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>