[exim-cvs] Testsuite: ignore all fork-time debug

Autor: Exim Git Commits Mailing List
Datum:
To: exim-cvs
Betreff: [exim-cvs] Testsuite: ignore all fork-time debug

Gitweb: https://git.exim.org/exim.git/commitdiff/3b447cdfe3f9f53546d09d7e01d1e0ecf0d6696c

Commit:     3b447cdfe3f9f53546d09d7e01d1e0ecf0d6696c
Parent:     129a5d133927ff8fa4b3f941f83c022d2daf18f3
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Mon Mar 30 22:26:09 2020 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon Mar 30 22:26:09 2020 +0100

    Testsuite: ignore all fork-time debug
---
 test/runtest     |  6 +---
 test/stderr/0021 |  4 ---
 test/stderr/0037 |  6 ----
 test/stderr/0143 |  4 ---
 test/stderr/0169 |  4 ---
 test/stderr/0218 | 58 -----------------------------------
 test/stderr/0264 |  2 --
 test/stderr/0275 |  4 ---
 test/stderr/0278 |  4 ---
 test/stderr/0283 | 18 -----------
 test/stderr/0315 |  8 -----
 test/stderr/0332 | 12 --------
 test/stderr/0333 |  8 -----
 test/stderr/0357 | 14 ---------
 test/stderr/0358 |  8 -----
 test/stderr/0360 |  6 ----
 test/stderr/0361 |  4 ---
 test/stderr/0370 |  8 -----
 test/stderr/0374 | 40 ------------------------
 test/stderr/0375 | 62 --------------------------------------
 test/stderr/0377 | 12 --------
 test/stderr/0378 | 22 --------------
 test/stderr/0379 |  8 -----
 test/stderr/0380 |  4 ---
 test/stderr/0382 |  8 -----
 test/stderr/0386 |  8 -----
 test/stderr/0388 |  6 ----
 test/stderr/0393 | 16 ----------
 test/stderr/0402 | 12 --------
 test/stderr/0403 |  4 ---
 test/stderr/0404 | 12 --------
 test/stderr/0408 |  4 ---
 test/stderr/0426 |  8 -----
 test/stderr/0433 | 12 --------
 test/stderr/0437 |  8 -----
 test/stderr/0438 |  6 ----
 test/stderr/0450 |  8 -----
 test/stderr/0476 | 14 ---------
 test/stderr/0487 |  4 ---
 test/stderr/0512 | 16 ----------
 test/stderr/0529 |  6 ----
 test/stderr/0543 |  6 ----
 test/stderr/0544 |  4 ---
 test/stderr/0554 |  4 ---
 test/stderr/0609 |  6 ----
 test/stderr/1007 | 16 ----------
 test/stderr/2013 | 92 --------------------------------------------------------
 test/stderr/2035 |  8 -----
 test/stderr/2113 | 92 --------------------------------------------------------
 test/stderr/2135 |  8 -----
 test/stderr/2201 |  4 ---
 test/stderr/2600 |  4 ---
 test/stderr/2610 |  4 ---
 test/stderr/2620 |  4 ---
 test/stderr/4052 |  4 ---
 test/stderr/4520 |  4 ---
 test/stderr/5000 |  4 ---
 test/stderr/5004 |  6 ----
 test/stderr/5005 | 16 ----------
 test/stderr/5006 |  4 ---
 test/stderr/5008 |  8 -----
 test/stderr/5204 | 18 -----------
 62 files changed, 1 insertion(+), 793 deletions(-)

diff --git a/test/runtest b/test/runtest
index 6e6ed40..6ada78b 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1047,11 +1047,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     s/(?<=^>>>>>>>>>>>>>>>> Exim pid=)\d+(?= terminating)/pppp/;
     s/^(proxy-proc \w{5}-pid) \d+$/$1 pppp/;
     s/^(?:\s*\d+ )(exec .* -oPX)$/pppp $1/;
-    next if /postfork: /;
-    # ipv6-enabled platforms do more loookup, for AAAAs - so ignore the forking
-    next if / fork(?:ing|ed) for fakens-search/;
-    s/ forked for [^:]+: \K\d+/npppp/;
-
+    next if /(?:postfork: | fork(?:ing|ed) for )/;

     # IP address lookups use gethostbyname() when IPv6 is not supported,
     # and gethostbyname2() or getipnodebyname() when it is.
diff --git a/test/stderr/0021 b/test/stderr/0021
index c752fb7..dabace7 100644
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -186,16 +186,12 @@ end of ACL "rcpt": ACCEPT

>>
LOG: MAIN
<= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
-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
admin user
dropping to exim gid; retaining priv uid
x in "!bad"? yes (end of list)
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> x <x@y> R=accept T=appendfile
LOG: MAIN
diff --git a/test/stderr/0037 b/test/stderr/0037
index 8a1a1ce..5623c67 100644
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -4,8 +4,6 @@ trusted user
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-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,13 +41,11 @@ $home = >/usr<
calling userfilter router
rda_interpret (file): 'TESTSUITE/aux-var/0037.f-user'
expanded: 'TESTSUITE/aux-var/0037.f-user'
-local-accept-delivery forking for router-interpret
ssss bytes read from TESTSUITE/aux-var/0037.f-user
data is an Exim filter program
Filter: start of processing
Filter: end of processing
>>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
-local-accept-delivery forked for router-interpret: npppp
rda_interpret: subprocess yield=0 error=NULL
userfilter router generated userx@???
errors_to=NULL transport=NULL
@@ -106,8 +102,6 @@ After routing:
Failed addresses:
Deferred addresses:
locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> userx <filter-userx@???> R=user_accept2 T=appendfile
LOG: MAIN
diff --git a/test/stderr/0143 b/test/stderr/0143
index ce2eaf7..c1b6deb 100644
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -4,8 +4,6 @@ admin user
LOG: MAIN
<= CALLER@??? 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
@@ -14,7 +12,6 @@ dropping to exim gid; retaining priv uid
router_name <my_main_router>
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-local-accept-delivery forking for transport
transport_name <my_smtp>
my_smtp transport entered
userx@???
@@ -54,7 +51,6 @@ no messages waiting for 127.0.0.1
SMTP>> QUIT
cmd buf flush ddd bytes
SMTP(close)>>
-local-accept-delivery forked for transport: npppp
Leaving my_smtp transport
LOG: MAIN
=> userx@??? R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
diff --git a/test/stderr/0169 b/test/stderr/0169
index 99eeb54..4e0f4b6 100644
--- a/test/stderr/0169
+++ b/test/stderr/0169
@@ -3,8 +3,6 @@ configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-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
@@ -12,7 +10,6 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-local-accept-delivery forking for delivery-local
appendfile transport entered
appendfile: mode=600 notify_comsat=0 quota=52428800 warning=41%
file=TESTSUITE/test-mail/userx format=unix
@@ -33,7 +30,6 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
quota = 52428800 threshold = 21495808 old size = sssss message size = sss
appendfile yields 0 with errno=dd more_errno=dd
-local-accept-delivery forked for delivery-local: npppp
appendfile transport returned OK for userx@???
added retry item for T:userx@???: errno=dd more_errno=dd flags=1
LOG: MAIN
diff --git a/test/stderr/0218 b/test/stderr/0218
index 1e63d02..28db0ea 100644
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -7,28 +7,18 @@ LOG: queue_run MAIN
Start queue run: pid=pppp -qq
queue running combined directories
looking in TESTSUITE/spool//input
-fresh-exec forking for qrun-delivery
delivering 10HmaX-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun-delivery forking for transport
T: send_to_server (ACL)
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun-delivery
delivering 10HmaY-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun-delivery forking for transport
T: send_to_server (ACL)
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
queue running combined directories
looking in TESTSUITE/spool//input
-fresh-exec forking for qrun-delivery
delivering 10HmaX-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun-delivery forking for transport
T: send_to_server (ACL)
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
@@ -43,12 +33,6 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 351 Send more
SMTP>> writing message and terminating "."
SMTP<< 250 OK
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
SMTP(close)>>
LOG: MAIN
=> a@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK"
@@ -62,12 +46,10 @@ admin user
dropping to exim gid; retaining priv uid
delivering 10HmaY-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-continued-transport forking for transport
T: send_to_server (ACL)
SMTP>> MAIL FROM:<CALLER@???>
SMTP>> RCPT TO:<b@???>
SMTP>> DATA
-continued-transport forked for transport: npppp
SMTP<< 250 OK
SMTP<< 250 OK
SMTP<< 351 Send more
@@ -92,28 +74,18 @@ LOG: queue_run MAIN
Start queue run: pid=pppp -qq
queue running combined directories
looking in TESTSUITE/spool//input
-fresh-exec forking for qrun-delivery
delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun-delivery forking for transport
T: send_to_server (ACL)
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun-delivery
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun-delivery forking for transport
T: send_to_server (ACL)
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
queue running combined directories
looking in TESTSUITE/spool//input
-fresh-exec forking for qrun-delivery
delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun-delivery forking for transport
T: send_to_server (ACL)
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
@@ -128,12 +100,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 503 Unexpected DATA
SMTP>> QUIT
SMTP(close)>>
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
LOG: MAIN
** a@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@???>: 550 NO
-qrun-delivery forking for bounce-message
-qrun-delivery forked for bounce-message: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -144,16 +112,12 @@ LOG: MAIN
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun-delivery
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun-delivery forking for transport
T: send_to_server (ACL)
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
LOG: MAIN
== b@??? R=client T=send_to_server defer (dd): Connection refused
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -166,15 +130,10 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
-fresh-exec forking for qrun-delivery
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun-delivery forking for transport
T: send_to_server (ACL)
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun-delivery
delivering 10HmbB-0005vi-00 (queue run pid ppppp)
R: bounce (ACL)
LOG: MAIN
@@ -184,19 +143,12 @@ LOG: MAIN
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun-delivery: npppp
-fresh-exec forking for qrun-delivery
delivering 10HmbC-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun-delivery forking for transport
T: send_to_server (ACL)
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

-fresh-exec forking for qrun-delivery
 delivering 10HmbA-0005vi-00 (queue run pid ppppp)
 R: client  (ACL)
-qrun-delivery forking for transport
 T: send_to_server  (ACL)
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 220 Server ready
@@ -211,17 +163,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 503 Unexpected DATA
   SMTP>> RSET
   SMTP<< 250 OK
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
   ** b@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@???>: 550 Unknown
-qrun-delivery forking for bounce-message
-qrun-delivery forked for bounce-message: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -239,12 +183,10 @@ admin user
 dropping to exim gid; retaining priv uid
 delivering 10HmbC-0005vi-00 (queue run pid ppppp)
 R: client  (ACL)
-continued-transport forking for transport
 T: send_to_server  (ACL)
   SMTP>> MAIL FROM:<CALLER@???>
   SMTP>> RCPT TO:<c@???>
   SMTP>> DATA
-continued-transport forked for transport: npppp
   SMTP<< 250 OK
   SMTP<< 250 OK
   SMTP<< 351 OK
diff --git a/test/stderr/0264 b/test/stderr/0264
index 57b377c..c7d81f5 100644
--- a/test/stderr/0264
+++ b/test/stderr/0264
@@ -9,8 +9,6 @@ DSN: **** SPOOL_OUT - address: <rz.b@outside> errorsto: <NULL> orcpt: <NULL> dsn
 Renaming spool header file: TESTSUITE/spool//input//10HmbJ-0005vi-00-H
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
-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
diff --git a/test/stderr/0275 b/test/stderr/0275
index 3f145e2..b4a95ec 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -144,9 +144,7 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-fresh-exec forking for local-accept-delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
-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
@@ -288,7 +286,6 @@ search_tidyup called
  failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to userx <userx@???> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/
@@ -301,7 +298,6 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   maildir_use_size_file=no
   locking by lockfile fcntl 
 search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
 journalling userx@???
 t1 transport returned OK for userx@???
 post-process userx@??? (0)
diff --git a/test/stderr/0278 b/test/stderr/0278
index 787af9c..ef1f436 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -103,9 +103,7 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-fresh-exec forking for local-accept-delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
-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
@@ -202,7 +200,6 @@ search_tidyup called
  failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to CALLER <CALLER@???> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=CALLER_HOME current=CALLER_HOME
@@ -215,7 +212,6 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   maildir_use_size_file=no
   locking by lockfile fcntl 
 search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
 journalling CALLER@???
 t1 transport returned OK for CALLER@???
 post-process CALLER@??? (0)
diff --git a/test/stderr/0283 b/test/stderr/0283
index 24d01b2..0b05aa3 100644
--- a/test/stderr/0283
+++ b/test/stderr/0283
@@ -14,8 +14,6 @@ getpwnam() succeeded uid=uuuu gid=gggg
 LOG: MAIN
   <= CALLER@??? 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 ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
@@ -29,21 +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
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to somebody <somebody@???> transport=t1
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-delivery-local forking for pipe-tpt-cmd
-local-accept-delivery forked for delivery-local: npppp
-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
   ** somebody@??? R=rest T=t1: return message generated
 changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-local-accept-delivery forking for bounce-message
-local-accept-delivery forked for bounce-message: npppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
@@ -60,8 +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
-bounce-message forking for local-accept-delivery
-bounce-message forked for local-accept-delivery: npppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
@@ -75,10 +63,8 @@ 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
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to CALLER <CALLER@???> transport=t2
   uid=CALLER_UID gid=CALLER_GID pid=pppp
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => CALLER <CALLER@???> R=caller T=t2
 changed uid/gid: post-delivery tidying
@@ -106,8 +92,6 @@ seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
-fresh-exec forking for 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
@@ -123,8 +107,6 @@ 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
-local-accept-delivery forking for logfile-create
-local-accept-delivery forked for logfile-create: npppp
 LOG: MAIN
   == never@??? R=never T=t3 defer (-29): User 0 set for t3 transport is on the never_users list
 changed uid/gid: post-delivery tidying
diff --git a/test/stderr/0315 b/test/stderr/0315
index 155fb4d..dbd85c0 100644
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@??? 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
@@ -50,9 +48,7 @@ After routing:
     y@???
   Failed addresses:
   Deferred addresses:
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   *> x@??? R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
@@ -66,8 +62,6 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
-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
@@ -131,9 +125,7 @@ After routing:
     y@???
   Failed addresses:
   Deferred addresses:
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   *> x@??? R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
diff --git a/test/stderr/0332 b/test/stderr/0332
index 3b65e31..4f50e9d 100644
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -4,7 +4,6 @@ admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp
-fresh-exec forking for qrun-delivery
 locking TESTSUITE/spool/db/retry.lockfile

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 Considering: ok@???
@@ -33,15 +32,8 @@ After routing:
     ok@???
   Failed addresses:
   Deferred addresses:
-qrun-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
 LOG: MAIN
   => ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
@@ -86,14 +78,11 @@ After routing:
   Failed addresses:
   Deferred addresses:
     delay@???
-continued-transport forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
-continued-transport forked for transport: npppp
 locking TESTSUITE/spool/db/wait-t1.lockfile
 LOG: MAIN
   => ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"

>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 Considering: delay@???
@@ -108,7 +97,6 @@ After routing:
   Deferred addresses:
     delay@???

diff --git a/test/stderr/0333 b/test/stderr/0333
index f17354e..605a551 100644
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -30,14 +30,8 @@ After routing:
     ok@???
   Failed addresses:
   Deferred addresses:
-fresh-exec forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-fresh-exec forked for transport: npppp
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
 LOG: MAIN
   => ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
@@ -82,9 +76,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     delay@???
-continued-transport forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
-continued-transport forked for transport: npppp
 locking TESTSUITE/spool/db/wait-t1.lockfile
 LOG: MAIN
   => ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
diff --git a/test/stderr/0357 b/test/stderr/0357
index a9aa515..5631467 100644
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@??? 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
@@ -24,12 +22,10 @@ After routing:
     userx@???
   Failed addresses:
   Deferred addresses:
-local-accept-delivery forking for transport
 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
-local-accept-delivery forked for transport: npppp
 reading retry information for R:userx@???:<CALLER@???> from subprocess
   added retry item
 LOG: MAIN
@@ -54,7 +50,6 @@ admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp
-fresh-exec forking for qrun-delivery
 locking TESTSUITE/spool/db/retry.lockfile

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 Considering: userx@???
@@ -70,14 +65,11 @@ After routing:
     userx@???
   Failed addresses:
   Deferred addresses:
-qrun-delivery forking for transport
 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 no message retry record
 added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
 reading retry information for R:userx@???:<CALLER@???> from subprocess
   existing delete item dropped
   added retry item
@@ -115,7 +107,6 @@ admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp
-fresh-exec forking for qrun-delivery
 locking TESTSUITE/spool/db/retry.lockfile

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 Considering: userx@???
@@ -131,14 +122,11 @@ After routing:
     userx@???
   Failed addresses:
   Deferred addresses:
-qrun-delivery forking for transport
 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 no message retry record
 added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
 reading retry information for R:userx@???:<CALLER@???> from subprocess
   existing delete item dropped
   added retry item
@@ -176,7 +164,6 @@ admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp
-fresh-exec forking for qrun-delivery
 locking TESTSUITE/spool/db/retry.lockfile

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: userx@???
@@ -201,7 +188,6 @@ Deferred addresses:
userx@???: no retry items
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun-delivery: npppp
LOG: queue_run MAIN
End queue run: pid=pppp
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0358 b/test/stderr/0358
index f6762da..219691d 100644
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@??? 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
@@ -29,13 +27,11 @@ After routing:
     usery@???
   Failed addresses:
   Deferred addresses:
-local-accept-delivery forking for transport
 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
 added retry item for R:usery@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
-local-accept-delivery forked for transport: npppp
 reading retry information for R:userx@???:<CALLER@???> from subprocess
   added retry item
 reading retry information for R:usery@???:<CALLER@???> from subprocess
@@ -70,7 +66,6 @@ admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp
-fresh-exec forking for qrun-delivery
 locking TESTSUITE/spool/db/retry.lockfile

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 Considering: userx@???
@@ -94,15 +89,12 @@ After routing:
     usery@???
   Failed addresses:
   Deferred addresses:
-qrun-delivery forking for transport
 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 no message retry record
 added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
 added retry item for R:usery@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
 reading retry information for R:userx@???:<CALLER@???> from subprocess
   existing delete item dropped
   added retry item
diff --git a/test/stderr/0360 b/test/stderr/0360
index 3fd5055..8d925df 100644
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@??? 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
@@ -144,9 +142,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer@???
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   *> unknown@??? <cms@???> R=r1 T=t1 H=recurse.test.ex.test.ex [V4NET.99.0.2] C="delivery bypassed by -N option"

>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -157,7 +153,6 @@ 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
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

@@ -248,7 +243,6 @@ After routing:
   Deferred addresses:
     defer@???

 --------> |TESTSUITE/bin/iefbr14 <--------
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to |TESTSUITE/bin/iefbr14 <|TESTSUITE/bin/iefbr14> transport=t1
   uid=EXIM_UID gid=CALLER_GID pid=pppp
 t1 transport entered
 direct command:
   argv[0] = 'TESTSUITE/bin/iefbr14'
-delivery-local forking for pipe-tpt-cmd
-local-accept-delivery forked for delivery-local: npppp
-delivery-local forked for pipe-tpt-cmd: npppp
-delivery-local forking for pipe-tpt-output
-delivery-local forked for pipe-tpt-output: npppp
 Writing message to pipe
 writing data block fd=dddd size=sss timeout=3600
 writing error EEE: Broken pipe
diff --git a/test/stderr/0374 b/test/stderr/0374
index 7d881dd..02207cc 100644
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@??? 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
@@ -339,88 +337,52 @@ After routing:
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => a1 <a1@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => b1 <b1@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => c1 <c1@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => d1 <d1@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => d2 <d2@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => d3 <d3@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => a1 <a1@???> R=u1 T=ut1
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-delivery-local forking for pipe-tpt-cmd
-local-accept-delivery forked for delivery-local: npppp
-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
   ** b1@??? 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
-local-accept-delivery forking for delivery-local
-delivery-local forking for pipe-tpt-cmd
-local-accept-delivery forked for delivery-local: npppp
-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
   == c1@??? 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
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   => d1@??? R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   == d2@??? 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@???>: 450 soft error
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   ** d3@??? R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@???>: 550 hard error
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for bounce-message
-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
-bounce-message forking for local-accept-delivery
-bounce-message forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -470,8 +432,6 @@ After routing:
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => CALLER <CALLER@???> R=real T=real
 LOG: MAIN
diff --git a/test/stderr/0375 b/test/stderr/0375
index 003a67b..117d285 100644
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@??? 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
@@ -759,127 +757,79 @@ After routing:
   Deferred addresses:
     g1@???
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => a1 <a1@???> P=<CALLER@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => b1 <b1@???> P=<CALLER@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => c1 <c1@???> P=<CALLER@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => d1 <d1@???> P=<CALLER@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => d2 <d2@???> P=<CALLER@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => d3 <d3@???> P=<CALLER@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => e1 <e1@???> P=<CALLER@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => f1 <f1@???> P=<CALLER@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => f2 <f2@???> P=<CALLER@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => f3 <f3@???> P=<CALLER@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => a1 <a1@???> P=<> R=u1 T=ut1
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-delivery-local forking for pipe-tpt-cmd
-local-accept-delivery forked for delivery-local: npppp
-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
   ** b1@??? P=<> 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
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-delivery-local forking for pipe-tpt-cmd
-local-accept-delivery forked for delivery-local: npppp
-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
   == c1@??? 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
 log writing disabled
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   => d1@??? P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 log writing disabled
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   == d2@??? 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@???>: 450 soft error
 log writing disabled
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   ** d3@??? P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@???>: 550 hard error
 log writing disabled
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut5.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   ** e1@??? P=<> R=ut5 T=ut5 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e1@???>: 550 hard error
 log writing disabled
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut6.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   => f1@??? P=<CALLER@???> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1] C="250 OK"
 log writing disabled
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   == f2@??? R=ut6 T=ut6 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f2@???>: 450 soft error
 log writing disabled
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut6.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   ** f3@??? P=<CALLER@???> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f3@???>: 550 hard error
 log writing disabled
@@ -887,16 +837,12 @@ locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   f3@??? <f3@???>: error ignored
 log writing disabled
-local-accept-delivery forking for bounce-message
-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
-bounce-message forking for local-accept-delivery
-bounce-message forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -962,8 +908,6 @@ After routing:
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => CALLER <CALLER@???> P=<> R=real T=real
 LOG: MAIN
@@ -983,8 +927,6 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
-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
@@ -1070,13 +1012,9 @@ After routing:
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => h1 <h1@???> P=<CALLER@???> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => h1 <h1@???> P=<CALLER@???> R=ut8 T=ut1
 log writing disabled
diff --git a/test/stderr/0377 b/test/stderr/0377
index b01fcf8..6505ab0 100644
--- a/test/stderr/0377
+++ b/test/stderr/0377
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@??? 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
@@ -301,18 +299,12 @@ After routing:
     defer_bbbb@???
     defer_cccc@???
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => aaaa <aaaa@???> R=seen_aaaa T=t1
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => bbbb <bbbb@???> R=bbbb_0 T=t1
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => cccc <cccc@???> R=cccc_accept T=t1
 locking TESTSUITE/spool/db/retry.lockfile
@@ -324,7 +316,6 @@ 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
 locking TESTSUITE/spool/db/retry.lockfile

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: aaaa@???
@@ -561,7 +552,6 @@ aaaa@??? was previously delivered (t1 transport): discarded
bbbb@??? was previously delivered (t1 transport): discarded
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun-delivery: npppp
LOG: queue_run MAIN
End queue run: pid=pppp -qf
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -571,7 +561,6 @@ 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
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: aaaa@???
@@ -808,7 +797,6 @@ aaaa@??? was previously delivered (t1 transport): discarded
bbbb@??? was previously delivered (t1 transport): discarded
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun-delivery: npppp
LOG: queue_run MAIN
End queue run: pid=pppp -qf
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0378 b/test/stderr/0378
index 061aea5..a3a48dc 100644
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -4,8 +4,6 @@ admin user
LOG: MAIN
<= CALLER@??? 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
data is an Exim filter program
Filter: start of processing
Filter: end of processing
>>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>

-local-accept-delivery forked for router-interpret: npppp
 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@???
@@ -119,17 +115,11 @@ After routing:
   Deferred addresses:
     defer_aaaa@???
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-delivery-local forking for autoreply
-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
-autoreply forking for local-accept-delivery
-autoreply forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -168,18 +158,10 @@ LOG: MAIN
 LOG: MAIN
   => >CALLER@??? <aaaa@???> R=aaaa T=t3
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-delivery-local forking for pipe-tpt-cmd
-local-accept-delivery forked for delivery-local: npppp
-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@???> 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@???> R=aaaa T=t1
 locking TESTSUITE/spool/db/retry.lockfile
@@ -191,7 +173,6 @@ 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
 locking TESTSUITE/spool/db/retry.lockfile

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: aaaa@???
@@ -251,13 +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
data is an Exim filter program
Filter: start of processing
Filter: end of processing
>>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>

-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for router-interpret: npppp
 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@???
diff --git a/test/stderr/0379 b/test/stderr/0379
index 06eb15c..87cb608 100644
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@??? 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
@@ -128,13 +126,9 @@ After routing:
   Deferred addresses:
     defer@???
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => bbbb <aaaa@???> R=bc T=t1
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => cccc <aaaa@???> R=bc T=t1
 locking TESTSUITE/spool/db/retry.lockfile
@@ -146,7 +140,6 @@ 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
 locking TESTSUITE/spool/db/retry.lockfile

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 Considering: defer@???
@@ -176,7 +169,6 @@ After routing:
     defer@???
 locking TESTSUITE/spool/db/retry.lockfile

diff --git a/test/stderr/0380 b/test/stderr/0380
index 9e43cbb..46dc1c5 100644
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@??? 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
@@ -81,8 +79,6 @@ After routing:
   Deferred addresses:
     aaaa@???
 locking TESTSUITE/spool/db/retry.lockfile
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => bbbb <bbbb@???> R=r3 T=t1
 locking TESTSUITE/spool/db/retry.lockfile
diff --git a/test/stderr/0382 b/test/stderr/0382
index 5983fb3..28d847e 100644
--- a/test/stderr/0382
+++ b/test/stderr/0382
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@??? 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
@@ -17,16 +15,12 @@ running system filter
 system filter returned 1
 LOG: MAIN
   ** userx@??? R=r1: forced fail
-local-accept-delivery forking for bounce-message
-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
-bounce-message forking for local-accept-delivery
-bounce-message forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -52,13 +46,11 @@ 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
 LOG: MAIN
   cancelled by timeout_frozen_after
 LOG: MAIN
   Completed

>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun-delivery: npppp
LOG: queue_run MAIN
End queue run: pid=pppp -qf
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0386 b/test/stderr/0386
index e4dd3be..1c65719 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -243,9 +243,7 @@ LOG: MAIN
<= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
SMTP>> 250 OK id=10HmaX-0005vi-00
search_tidyup called
-fresh-exec forking for local-accept-delivery
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
-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
@@ -319,7 +317,6 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-local-accept-delivery forking for delivery-local
changed uid/gid: local delivery to 2 <2@b> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -342,7 +339,6 @@ 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
search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
journalling 2@b
t1 transport returned OK for 2@b
post-process 2@b (0)
@@ -440,9 +436,7 @@ LOG: MAIN
<= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
SMTP>> 250 OK id=10HmaY-0005vi-00
search_tidyup called
-fresh-exec forking for local-accept-delivery
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
-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
@@ -515,7 +509,6 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-local-accept-delivery forking for delivery-local
changed uid/gid: local delivery to 2 <2@b> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -538,7 +531,6 @@ 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
search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
journalling 2@b
t1 transport returned OK for 2@b
post-process 2@b (0)
diff --git a/test/stderr/0388 b/test/stderr/0388
index 63a0369..aba5a11 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -70,7 +70,6 @@ After routing:
Deferred addresses:
search_tidyup called
search_tidyup called
-fresh-exec forking for transport
changed uid/gid: remote delivery to x@y with transport=smtp
uid=EXIM_UID gid=EXIM_GID pid=pppp
set_process_info: pppp delivering 10HmaX-0005vi-00 using smtp
@@ -102,7 +101,6 @@ added retry item for R:x@y: errno=-44 more_errno=dd,A flags=0
SMTP>> QUIT
cmd buf flush ddd bytes
SMTP(close)>>
-fresh-exec forked for transport: npppp
set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for x@y: result OK
address match test: subject=*@127.0.0.1 pattern=*
127.0.0.1 in "*"? yes (matched "*")
@@ -171,9 +169,7 @@ LOG: MAIN
EXIM_DBCLOSE(0xAAAAAAAA)
closed hints database and lockfile
end of retry processing
-fresh-exec forking for bounce-message
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd bounce-message -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
-fresh-exec forked for bounce-message: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -228,9 +224,7 @@ Size of headers = sss
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
search_tidyup called
-bounce-message forking for local-accept-delivery
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
-bounce-message forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
diff --git a/test/stderr/0393 b/test/stderr/0393
index 0c68b4e..0177ee3 100644
--- a/test/stderr/0393
+++ b/test/stderr/0393
@@ -4,8 +4,6 @@ admin user
LOG: MAIN
<= CALLER@??? 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
@@ -13,7 +11,6 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-local-accept-delivery forking for delivery-local
direct command:
argv[0] = '/bin/cat'
direct command after expansion:
@@ -31,15 +28,10 @@ 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
-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 tpt-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 tpt-filter-writer: npppp
process pppp writing to transport filter
copying from the filter
waiting for filter process
@@ -60,8 +52,6 @@ configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-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
@@ -69,7 +59,6 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-local-accept-delivery forking for delivery-local
direct command:
direct command after expansion:
appendfile transport entered
@@ -89,7 +78,6 @@ 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
-local-accept-delivery forked for delivery-local: npppp
t1 transport returned OK for userx@???
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
@@ -102,8 +90,6 @@ configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-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
@@ -111,7 +97,6 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>

 --------> userx@??? <--------
-local-accept-delivery forking for delivery-local
 direct command:
   argv[0] = '${if={1}{1}{}{}}'
 direct command after expansion:
@@ -133,7 +118,6 @@ 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
-local-accept-delivery forked for delivery-local: npppp
 t1 transport returned OK for userx@???
 LOG: MAIN
   => userx <userx@???> R=r1 T=t1
diff --git a/test/stderr/0402 b/test/stderr/0402
index c931d86..5c3ce6d 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -174,9 +174,7 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-fresh-exec forking for local-accept-delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
-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
@@ -458,7 +456,6 @@ no retry data available
  ╰─────result: /non-exist/usery
             ╰──(tainted)
 search_tidyup called
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=ft1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=/non-exist/usery current=/
@@ -503,7 +500,6 @@ 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
 search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
 journalling TESTSUITE/test-mail/junk:rd+usery@???
 ft1 transport returned OK for TESTSUITE/test-mail/junk
 post-process TESTSUITE/test-mail/junk (0)
@@ -519,7 +515,6 @@ LOG: MAIN
  failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=ft1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=/non-exist/CALLER current=/
@@ -564,7 +559,6 @@ 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
 search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
 journalling TESTSUITE/test-mail/junk:rd+CALLER@???
 ft1 transport returned OK for TESTSUITE/test-mail/junk
 post-process TESTSUITE/test-mail/junk (0)
@@ -580,7 +574,6 @@ LOG: MAIN
  failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to CALLER <CALLER@???> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=/non-exist/CALLER current=/
@@ -593,7 +586,6 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   maildir_use_size_file=no
   locking by lockfile fcntl 
 search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
 journalling CALLER@???
 t1 transport returned OK for CALLER@???
 post-process CALLER@??? (0)
@@ -612,7 +604,6 @@ no retry data available
  ╰─────result: /non-exist/usery
             ╰──(tainted)
 search_tidyup called
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to usery <usery@???> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=/non-exist/usery current=/
@@ -625,7 +616,6 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   maildir_use_size_file=no
   locking by lockfile fcntl 
 search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
 journalling usery@???
 t1 transport returned OK for usery@???
 post-process usery@??? (0)
@@ -644,7 +634,6 @@ no retry data available
  ╰─────result: /userz
             ╰──(tainted)
 search_tidyup called
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to userz <userz@???> transport=t2
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=/userz current=/
@@ -657,7 +646,6 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   maildir_use_size_file=no
   locking by lockfile fcntl 
 search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
 journalling userz@???
 t2 transport returned OK for userz@???
 post-process userz@??? (0)
diff --git a/test/stderr/0403 b/test/stderr/0403
index 2b150c7..ab1fd9f 100644
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -44,9 +44,7 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-fresh-exec forking for local-accept-delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaX-0005vi-00
-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
@@ -162,7 +160,6 @@ search_tidyup called
  failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=/usr current=/usr
@@ -181,7 +178,6 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   locking by lockfile fcntl 
 *** delivery by t1 transport bypassed by -N option
 search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
 journalling TESTSUITE/test-mail/junk:userx@???
 t1 transport returned OK for TESTSUITE/test-mail/junk
 post-process TESTSUITE/test-mail/junk (0)
diff --git a/test/stderr/0404 b/test/stderr/0404
index 57349d8..1083b7b 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -143,9 +143,7 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-fresh-exec forking for local-accept-delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
-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
@@ -200,7 +198,6 @@ expanded: '#Exim filter
 mail text rhubarb
 seen finish'
 search_tidyup called
-local-accept-delivery forking for router-interpret
 changed uid/gid: r2 router (recipient is userx@???)
   uid=CALLER_UID gid=CALLER_GID pid=pppp
 turned off address rewrite logging (not root or exim in this process)
@@ -209,7 +206,6 @@ Filter: start of processing
 Filter: end of processing
 search_tidyup called

>>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>

-local-accept-delivery forked for router-interpret: npppp
 rda_interpret: subprocess yield=0 error=NULL
 set transport t1
 r2 router generated >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...
@@ -246,17 +242,13 @@ search_tidyup called
  failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ... <>sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/
 set_process_info: pppp **** string overflowed buffer ****
 t1 transport entered
 taking data from address
-delivery-local forking for autoreply
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd autoreply -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
-local-accept-delivery forked for delivery-local: npppp
-delivery-local forked for autoreply: npppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
@@ -1527,9 +1519,7 @@ Size of headers = sss
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
 search_tidyup called
-autoreply forking for local-accept-delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
-autoreply forked for local-accept-delivery: npppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
@@ -17991,7 +17981,6 @@ sender@??? is a duplicate address: discarded
  failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to sender <sender@???> transport=t2
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/
@@ -18016,7 +18005,6 @@ 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
 search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
 journalling sender@???
 t2 transport returned OK for sender@???
 post-process sender@??? (0)
diff --git a/test/stderr/0408 b/test/stderr/0408
index 8115b18..3152ea0 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -44,9 +44,7 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-fresh-exec forking for local-accept-delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
-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
@@ -143,7 +141,6 @@ search_tidyup called
  failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to userx <userx@???> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/
@@ -166,7 +163,6 @@ 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
 search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
 journalling userx@???
 t1 transport returned OK for userx@???
 post-process userx@??? (0)
diff --git a/test/stderr/0426 b/test/stderr/0426
index a76e5c5..b22c785 100644
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@??? 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
@@ -49,22 +47,16 @@ After routing:
     x@???
   Failed addresses:
   Deferred addresses:
-local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   ** x@??? R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@???>: 550 Unknown
-local-accept-delivery forking for bounce-message
-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
-bounce-message forking for local-accept-delivery
-bounce-message forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
diff --git a/test/stderr/0433 b/test/stderr/0433
index 1baa73a..6279681 100644
--- a/test/stderr/0433
+++ b/test/stderr/0433
@@ -18,9 +18,7 @@ LOG: MAIN
 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
-daemon forking for daemon-del-pidfile
 pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-daemon forked for daemon-del-pidfile: npppp
 search_tidyup called

>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -42,9 +40,7 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-daemon forking for daemon-del-pidfile
pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -67,9 +63,7 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1225 (IPv4) port 1226 (IPv4)
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-daemon forking for daemon-del-pidfile
pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -92,9 +86,7 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226 [127.0.0.1]:1228
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-daemon forking for daemon-del-pidfile
pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -118,9 +110,7 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1227 (IPv4)
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-daemon forking for daemon-del-pidfile
pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -144,8 +134,6 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-daemon forking for daemon-del-pidfile
pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0437 b/test/stderr/0437
index 238c4ae..3bd5982 100644
--- a/test/stderr/0437
+++ b/test/stderr/0437
@@ -16,7 +16,6 @@ dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp
 search_tidyup called
-fresh-exec forking for qrun-delivery
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
    key="transport" partial=-1 affix=NULL starflags=0
@@ -30,7 +29,6 @@ fresh-exec forking for qrun-delivery
  lookup yielded: t1
 search_tidyup called
 search_tidyup called
-qrun-delivery forking for delivery-local
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
    key="file" partial=-1 affix=NULL starflags=0
@@ -43,8 +41,6 @@ qrun-delivery forking for delivery-local
    in TESTSUITE/aux-fixed/0437.ls
  lookup yielded: file
 search_tidyup called
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for delivery-local: npppp
 LOG: MAIN
   => userx <userx@???> R=r1 T=t1
 LOG: MAIN
@@ -52,7 +48,6 @@ LOG: MAIN
 search_tidyup called

>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 search_tidyup called
-fresh-exec forking for qrun-delivery
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
    key="transport" partial=-1 affix=NULL starflags=0
@@ -66,7 +61,6 @@ fresh-exec forking for qrun-delivery
  lookup yielded: t1
 search_tidyup called
 search_tidyup called
-qrun-delivery forking for delivery-local
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
    key="file" partial=-1 affix=NULL starflags=0
@@ -79,8 +73,6 @@ qrun-delivery forking for delivery-local
    in TESTSUITE/aux-fixed/0437.ls
  lookup yielded: file
 search_tidyup called
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for delivery-local: npppp
 LOG: MAIN
   => userx <userx@???> R=r1 T=t1
 LOG: MAIN
diff --git a/test/stderr/0438 b/test/stderr/0438
index 9f62baa..4dc97dd 100644
--- a/test/stderr/0438
+++ b/test/stderr/0438
@@ -20,9 +20,7 @@ LOG: MAIN
 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
-daemon forking for daemon-del-pidfile
 pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-daemon forked for daemon-del-pidfile: npppp
 search_tidyup called

>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -45,9 +43,7 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-daemon forking for daemon-del-pidfile
pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.anotherpid -oPX
-daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -70,8 +66,6 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-daemon forking for daemon-del-pidfile
pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/mypidfile -oPX
-daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0450 b/test/stderr/0450
index de68564..9552e38 100644
--- a/test/stderr/0450
+++ b/test/stderr/0450
@@ -4,8 +4,6 @@ admin user
LOG: MAIN
<= CALLER@??? 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
@@ -13,7 +11,6 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-local-accept-delivery forking for transport
t1 transport entered
userx@???
using the transport's hosts: 127.0.0.1
@@ -25,7 +22,6 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1225: errno=dd more_errno=dd,A flags=2
-local-accept-delivery forked for transport: npppp
all IP addresses skipped or deferred at least one address
updating wait-t1 database
added to list for 127.0.0.1
@@ -40,10 +36,8 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
-fresh-exec forking for qrun-delivery
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-qrun-delivery forking for transport
t1 transport entered
userx@???
using the transport's hosts: 127.0.0.1
@@ -57,8 +51,6 @@ Connecting to 127.0.0.1 [127.0.0.1]:1226 ... failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1226: errno=dd more_errno=dd,A flags=2
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
all IP addresses skipped or deferred at least one address
updating wait-t1 database
already listed for 127.0.0.1
diff --git a/test/stderr/0476 b/test/stderr/0476
index 3f2451e..69ab06b 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -6,11 +6,9 @@ set_process_info: pppp running the queue (single queue run)
LOG: queue_run MAIN
Start queue run: pid=pppp
set_process_info: pppp running queue: 10HmaX-0005vi-00-H
-fresh-exec forking for qrun-delivery
set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid ppppp)
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-qrun-delivery forking for transport
set_process_info: pppp delivering 10HmaX-0005vi-00 using t1
t1 transport entered
userx@???
@@ -52,16 +50,12 @@ H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET
set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for userx@???: result OK
Leaving t1 transport
set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@??? in subprocess)
-fresh-exec forked for qrun-delivery: npppp
set_process_info: pppp running queue: waiting for 10HmaX-0005vi-00 (pppp)
-qrun-delivery forked for transport: npppp
set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish
set_process_info: pppp delivering 10HmaX-0005vi-00
LOG: MAIN
** userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 550 NO
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
-qrun-delivery forking for bounce-message
-qrun-delivery forked for bounce-message: npppp
cannot use sendfile for body: spoolfile not wireformat
writing data block fd=dddd size=sss timeout=0
Exim version x.yz ....
@@ -71,8 +65,6 @@ admin user
set_process_info: pppp accepting a local non-SMTP message from <>
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-bounce-message forking for local-accept-delivery
-bounce-message forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -82,7 +74,6 @@ set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaZ-0005vi-00
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> CALLER@??? <--------
-local-accept-delivery forking for transport
set_process_info: pppp delivering 10HmaZ-0005vi-00 using t1
t1 transport entered
CALLER@???
@@ -97,7 +88,6 @@ LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for CALLER@???: result DEFER
added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
-local-accept-delivery forked for transport: npppp
all IP addresses skipped or deferred at least one address
updating wait-t1 database
added to list for 127.0.0.1
@@ -116,11 +106,9 @@ LOG: MAIN
set_process_info: pppp running queue: waiting for children of pppp
set_process_info: pppp running queue
set_process_info: pppp running queue: 10HmaY-0005vi-00-H
-fresh-exec forking for qrun-delivery
set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid ppppp)
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> usery@??? <--------
-qrun-delivery forking for transport
set_process_info: pppp delivering 10HmaY-0005vi-00 using t1
t1 transport entered
usery@???
@@ -134,9 +122,7 @@ updating wait-t1 database
added to list for 127.0.0.1
Leaving t1 transport
set_process_info: pppp delivering 10HmaY-0005vi-00 (just run t1 for usery@??? in subprocess)
-fresh-exec forked for qrun-delivery: npppp
set_process_info: pppp running queue: waiting for 10HmaY-0005vi-00 (pppp)
-qrun-delivery forked for transport: npppp
set_process_info: pppp delivering 10HmaY-0005vi-00: waiting for a remote delivery subprocess to finish
set_process_info: pppp delivering 10HmaY-0005vi-00
LOG: retry_defer MAIN
diff --git a/test/stderr/0487 b/test/stderr/0487
index cf4fa55..5287e58 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -71,9 +71,7 @@ LOG: MAIN
created log directory TESTSUITE/spool/log
SMTP>> 250 OK id=10HmaX-0005vi-00
search_tidyup called
-fresh-exec forking for local-accept-delivery
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
-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
@@ -145,7 +143,6 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-local-accept-delivery forking for delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -170,7 +167,6 @@ 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
search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
diff --git a/test/stderr/0512 b/test/stderr/0512
index ce9a15e..aad4862 100644
--- a/test/stderr/0512
+++ b/test/stderr/0512
@@ -4,10 +4,8 @@ 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
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-qrun-delivery forking for transport
t1 transport entered
userx@???
using the transport's hosts: 127.0.0.1 : 127.0.0.1 : 127.0.0.1 : 127.0.0.1
@@ -22,8 +20,6 @@ LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
temporary delivery error(s) override hosts_max_try (message older than host's retry time)
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
getting address for 127.0.0.1
checking status of 127.0.0.1
no message retry record
@@ -65,8 +61,6 @@ LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
** userx@???: retry timeout exceeded
-qrun-delivery forking for bounce-message
-qrun-delivery forked for bounce-message: npppp
cannot use sendfile for body: spoolfile not wireformat
writing data block fd=dddd size=sss timeout=0
Exim version x.yz ....
@@ -75,8 +69,6 @@ trusted user
admin user
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-bounce-message forking for local-accept-delivery
-bounce-message forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -100,10 +92,8 @@ 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
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-qrun-delivery forking for transport
t1 transport entered
userx@???
using the transport's hosts: 127.0.0.1 : 127.0.0.1 : 127.0.0.1 : 127.0.0.1
@@ -118,8 +108,6 @@ LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
temporary delivery error(s) override hosts_max_try (message older than host's retry time)
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
getting address for 127.0.0.1
checking status of 127.0.0.1
no message retry record
@@ -141,8 +129,6 @@ LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
** userx@???: retry timeout exceeded
-qrun-delivery forking for bounce-message
-qrun-delivery forked for bounce-message: npppp
cannot use sendfile for body: spoolfile not wireformat
writing data block fd=dddd size=sss timeout=0
Exim version x.yz ....
@@ -151,8 +137,6 @@ trusted user
admin user
LOG: MAIN
<= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
-bounce-message forking for local-accept-delivery
-bounce-message forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
diff --git a/test/stderr/0529 b/test/stderr/0529
index 21961e6..8245120 100644
--- a/test/stderr/0529
+++ b/test/stderr/0529
@@ -4,8 +4,6 @@ admin user
LOG: MAIN
<= CALLER@??? 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
@@ -30,8 +28,6 @@ After routing:
Deferred addresses:
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp
added retry item for T:TESTSUITE/test-mail/rmbox:x@???: errno=-22 more_errno=dd flags=0
LOG: MAIN
== TESTSUITE/test-mail/rmbox <x@???> R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
@@ -57,7 +53,6 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
-fresh-exec forking for qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: x@???
@@ -90,7 +85,6 @@ Deferred addresses:
x@???: no retry items
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun-delivery: npppp
LOG: queue_run MAIN
End queue run: pid=pppp
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0543 b/test/stderr/0543
index dd70003..9619f9e 100644
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -4,7 +4,6 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
-fresh-exec forking for qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 Considering: userx@domain1
@@ -32,9 +31,6 @@ After routing:
     userx@domain1
   Failed addresses:
   Deferred addresses:
-qrun-delivery forking for transport
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-smtp.lockfile
 LOG: MAIN
@@ -42,7 +38,6 @@ LOG: MAIN
 LOG: MAIN
   Completed

>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 Considering: usery@domain1
@@ -57,7 +52,6 @@ After routing:
   Deferred addresses:
     usery@domain1

diff --git a/test/stderr/0544 b/test/stderr/0544
index 75ee481..e08c652 100644
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -119,20 +119,16 @@ admin user
 LOG: MAIN
   <= CALLER@??? 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 ....
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-local-accept-delivery forking for transport
  ╭considering: $domain
  ├──expanding: $domain
  ╰─────result: domain1.ex
             ╰──(tainted)
-local-accept-delivery forked for transport: npppp
 LOG: MAIN
   == userx@??? R=smarthost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue
 LOG: MAIN
diff --git a/test/stderr/0554 b/test/stderr/0554
index ff6b6c8..3ddb40e 100644
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -15,12 +15,10 @@ After routing:
     x@y
   Failed addresses:
   Deferred addresses:
-fresh-exec forking for transport
 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 added retry item for R:x@y:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
-fresh-exec forked for transport: npppp
 reading retry information for R:x@y:<CALLER@???> from subprocess
   added retry item
 LOG: MAIN
@@ -57,7 +55,6 @@ After routing:
     x@y
   Failed addresses:
   Deferred addresses:
-fresh-exec forking for transport
 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
@@ -65,7 +62,6 @@ no message retry record
 added retry item for R:x@y:<CALLER@???>: errno=dd more_errno=dd,A flags=1
 added retry item for R:x@y: errno=dd more_errno=dd,A flags=1
 locking TESTSUITE/spool/db/wait-smtp.lockfile
-fresh-exec forked for transport: npppp
 reading retry information for R:x@y from subprocess
   existing delete item dropped
   added delete item
diff --git a/test/stderr/0609 b/test/stderr/0609
index d4f1134..54e45a7 100644
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -17,14 +17,12 @@ ppppp Listening...
 ppppp Connection request from 127.0.0.1 port sssss
 ppppp LOG: smtp_connection MAIN
 ppppp   SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
-ppppp daemon forking for daemon-accept
 ppppp Process ppppp is handling incoming connection from [127.0.0.1]
 ppppp Process ppppp is ready for new message
 ppppp using ACL "delay4_accept"
 ppppp processing "accept" (TESTSUITE/test-config 24)
 ppppp check delay = 4s
 ppppp delay modifier requests 4-second delay
-ppppp daemon forked for daemon-accept: npppp
 ppppp 1 SMTP accept process running
 ppppp Listening...
 ppppp accept: condition test succeeded in ACL "delay4_accept"
@@ -39,7 +37,6 @@ ppppp Listening...
 ppppp Connection request from 127.0.0.1 port sssss
 ppppp LOG: smtp_connection MAIN
 ppppp   SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
-ppppp daemon forking for daemon-accept
 ppppp Process ppppp is handling incoming connection from [127.0.0.1]
 ppppp Process ppppp is ready for new message
 ppppp using ACL "delay4_accept"
@@ -52,8 +49,5 @@ ppppp end of ACL "delay4_accept": ACCEPT
 ppppp LOG: lost_incoming_connection MAIN
 ppppp   unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>>
-ppppp daemon forked for daemon-accept: npppp
 ppppp 1 SMTP accept process running
-ppppp daemon forking for daemon-del-pidfile
-ppppp daemon forked for daemon-del-pidfile: npppp
 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/1007 b/test/stderr/1007
index 27489e9..098c838 100644
--- a/test/stderr/1007
+++ b/test/stderr/1007
@@ -19,9 +19,7 @@ LOG: MAIN
 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
-daemon forking for daemon-del-pidfile
 pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-daemon forked for daemon-del-pidfile: npppp
 search_tidyup called

-fresh-exec forking for qrun-delivery
-qrun-delivery forking for transport
 Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME
@@ -51,14 +35,6 @@ cmd buf flush ddd bytes
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbA-0005vi-00
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
-transport forking for tls-proxy-interproc
-tls-proxy-interproc forking for tls-proxy
-transport forked for tls-proxy-interproc: npppp
-tls-proxy-interproc forked for tls-proxy: npppp
 LOG: MAIN
   => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
 LOG: MAIN
@@ -69,7 +45,6 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-continued-transport forking for transport
   SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
   SMTP>> RCPT TO:<userz@???>
   SMTP>> DATA
@@ -78,11 +53,6 @@ cmd buf flush ddd bytes
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbB-0005vi-00
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-continued-transport forked for transport: npppp
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
   => userz@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00"
@@ -94,7 +64,6 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-continued-transport forking for transport
   SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
   SMTP>> RCPT TO:<usery@???>
   SMTP>> DATA
@@ -106,7 +75,6 @@ cmd buf flush ddd bytes
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>
-continued-transport forked for transport: npppp

>>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> usery@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00"
@@ -122,29 +90,13 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
-fresh-exec forking for qrun-delivery
-qrun-delivery forking for transport
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun-delivery
-qrun-delivery forking for transport
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun-delivery
-qrun-delivery forking for transport
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

-fresh-exec forking for qrun-delivery
-qrun-delivery forking for transport
 Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME
@@ -169,14 +121,6 @@ cmd buf flush ddd bytes
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbG-0005vi-00
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
-transport forking for tls-proxy-interproc
-tls-proxy-interproc forking for tls-proxy
-transport forked for tls-proxy-interproc: npppp
-tls-proxy-interproc forked for tls-proxy: npppp
 LOG: MAIN
   => usera@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00"
 LOG: MAIN
@@ -187,7 +131,6 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-continued-transport forking for transport
   SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
   SMTP>> RCPT TO:<userc@???>
   SMTP>> DATA
@@ -196,11 +139,6 @@ cmd buf flush ddd bytes
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbH-0005vi-00
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-continued-transport forked for transport: npppp
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
   => userc@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00"
@@ -212,7 +150,6 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-continued-transport forking for transport
   SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
   SMTP>> RCPT TO:<userb@???>
   SMTP>> DATA
@@ -224,7 +161,6 @@ cmd buf flush ddd bytes
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>
-continued-transport forked for transport: npppp

>>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> userb@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00"
@@ -240,29 +176,13 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
-fresh-exec forking for qrun-delivery
-qrun-delivery forking for transport
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun-delivery
-qrun-delivery forking for transport
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun-delivery
-qrun-delivery forking for transport
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

-fresh-exec forking for qrun-delivery
-qrun-delivery forking for transport
 Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME
@@ -295,10 +215,6 @@ cmd buf flush ddd bytes
          250-PIPELINING
          250-STARTTLS
          250 HELP
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
   => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbM-0005vi-00"
@@ -310,10 +226,8 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-continued-transport forking for transport
   SMTP>> STARTTLS
 cmd buf flush ddd bytes
-continued-transport forked for transport: npppp
   SMTP<< 220 TLS go ahead
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
@@ -338,10 +252,6 @@ cmd buf flush ddd bytes
          250-PIPELINING
          250-STARTTLS
          250 HELP
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
   => userz@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00"
@@ -353,10 +263,8 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-continued-transport forking for transport
   SMTP>> STARTTLS
 cmd buf flush ddd bytes
-continued-transport forked for transport: npppp
   SMTP<< 220 TLS go ahead
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
diff --git a/test/stderr/2035 b/test/stderr/2035
index b836e5e..7075906 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -35,15 +35,9 @@ sync_responses expect rcpt
   SMTP<< 250 Accepted
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local-smtp S=sss
-fresh-exec forking for local-accept-delivery
-fresh-exec forked for local-accept-delivery: npppp
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT

-fresh-exec forking for qrun-delivery
-qrun-delivery forking for transport
 Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME
@@ -51,14 +35,6 @@ cmd buf flush ddd bytes
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbA-0005vi-00
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
-transport forking for tls-proxy-interproc
-tls-proxy-interproc forking for tls-proxy
-transport forked for tls-proxy-interproc: npppp
-tls-proxy-interproc forked for tls-proxy: npppp
 LOG: MAIN
   => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
 LOG: MAIN
@@ -69,7 +45,6 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-continued-transport forking for transport
   SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
   SMTP>> RCPT TO:<userz@???>
   SMTP>> DATA
@@ -78,11 +53,6 @@ cmd buf flush ddd bytes
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbB-0005vi-00
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-continued-transport forked for transport: npppp
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
   => userz@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00"
@@ -94,7 +64,6 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-continued-transport forking for transport
   SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
   SMTP>> RCPT TO:<usery@???>
   SMTP>> DATA
@@ -106,7 +75,6 @@ cmd buf flush ddd bytes
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>
-continued-transport forked for transport: npppp

-fresh-exec forking for qrun-delivery
-qrun-delivery forking for transport
 Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME
@@ -169,14 +121,6 @@ cmd buf flush ddd bytes
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbG-0005vi-00
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
-transport forking for tls-proxy-interproc
-tls-proxy-interproc forking for tls-proxy
-transport forked for tls-proxy-interproc: npppp
-tls-proxy-interproc forked for tls-proxy: npppp
 LOG: MAIN
   => usera@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00"
 LOG: MAIN
@@ -187,7 +131,6 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-continued-transport forking for transport
   SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
   SMTP>> RCPT TO:<userc@???>
   SMTP>> DATA
@@ -196,11 +139,6 @@ cmd buf flush ddd bytes
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbH-0005vi-00
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-continued-transport forked for transport: npppp
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
   => userc@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00"
@@ -212,7 +150,6 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-continued-transport forking for transport
   SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
   SMTP>> RCPT TO:<userb@???>
   SMTP>> DATA
@@ -224,7 +161,6 @@ cmd buf flush ddd bytes
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>
-continued-transport forked for transport: npppp

-fresh-exec forking for qrun-delivery
-qrun-delivery forking for transport
 Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for transport: npppp
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME
@@ -295,10 +215,6 @@ cmd buf flush ddd bytes
          250-PIPELINING
          250-STARTTLS
          250 HELP
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
   => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbM-0005vi-00"
@@ -310,10 +226,8 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-continued-transport forking for transport
   SMTP>> STARTTLS
 cmd buf flush ddd bytes
-continued-transport forked for transport: npppp
   SMTP<< 220 TLS go ahead
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
@@ -338,10 +252,6 @@ cmd buf flush ddd bytes
          250-PIPELINING
          250-STARTTLS
          250 HELP
-transport forking for continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
   => userz@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00"
@@ -353,10 +263,8 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-continued-transport forking for transport
   SMTP>> STARTTLS
 cmd buf flush ddd bytes
-continued-transport forked for transport: npppp
   SMTP<< 220 TLS go ahead
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
diff --git a/test/stderr/2135 b/test/stderr/2135
index b836e5e..7075906 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -35,15 +35,9 @@ sync_responses expect rcpt
   SMTP<< 250 Accepted
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local-smtp S=sss
-fresh-exec forking for local-accept-delivery
-fresh-exec forked for local-accept-delivery: npppp
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT

>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
-local-accept-delivery forking for tls-proxy-interproc
-tls-proxy-interproc forking for tls-proxy
-local-accept-delivery forked for tls-proxy-interproc: npppp
-tls-proxy-interproc forked for tls-proxy: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -51,7 +45,6 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userb@??? <--------
-local-accept-delivery forking for transport
t1 transport entered
userb@???
hostlist:
@@ -74,7 +67,6 @@ ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
SMTP>> QUIT
cmd buf flush ddd bytes
SMTP(close)>>
-local-accept-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
Leaving t1 transport
LOG: MAIN
diff --git a/test/stderr/2201 b/test/stderr/2201
index fd1452a..26c59e8 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -202,10 +202,8 @@ ppppp exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on
ppppp daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
ppppp Listening...
ppppp Connection request from 127.0.0.1 port sssss
-ppppp daemon forking for daemon-accept
ppppp Process ppppp is handling incoming connection from [127.0.0.1]
ppppp Process ppppp is ready for new message
-ppppp daemon forked for daemon-accept: npppp
ppppp 1 SMTP accept process running
ppppp Listening...
ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
@@ -232,6 +230,4 @@ ppppp child ppppp ended: status=0x0
ppppp normal exit, 0
ppppp 0 SMTP accept processes now running
ppppp Listening...
-ppppp daemon forking for daemon-del-pidfile
-ppppp daemon forked for daemon-del-pidfile: npppp
ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/2600 b/test/stderr/2600
index 0c3a59d..15e9bb5 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -331,9 +331,7 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept-delivery
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
-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
@@ -413,7 +411,6 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-local-accept-delivery forking for delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -445,7 +442,6 @@ 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
search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
diff --git a/test/stderr/2610 b/test/stderr/2610
index 525beec..36bb8e9 100644
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -324,9 +324,7 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept-delivery
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
-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
@@ -408,7 +406,6 @@ close MYSQL connection: 127.0.0.1:1223/test/root
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-local-accept-delivery forking for delivery-local
changed uid/gid: local delivery to ph10 <ph10@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -442,7 +439,6 @@ writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
close MYSQL connection: 127.0.0.1:1223/test/root
-local-accept-delivery forked for delivery-local: npppp
journalling ph10@???
t1 transport returned OK for ph10@???
post-process ph10@??? (0)
diff --git a/test/stderr/2620 b/test/stderr/2620
index e9fffa5..3bbe56f 100644
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -342,9 +342,7 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept-delivery
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
-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
@@ -426,7 +424,6 @@ close PGSQL connection: localhost:1223/test/CALLER
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-local-accept-delivery forking for delivery-local
changed uid/gid: local delivery to CALLER <CALLER@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -460,7 +457,6 @@ writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
close PGSQL connection: localhost:1223/test/CALLER
-local-accept-delivery forked for delivery-local: npppp
journalling CALLER@???
t1 transport returned OK for CALLER@???
post-process CALLER@??? (0)
diff --git a/test/stderr/4052 b/test/stderr/4052
index 3de6f82..cf06d96 100644
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -3,8 +3,6 @@ configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-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
@@ -12,7 +10,6 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>

 --------> extchange@??? <--------
-local-accept-delivery forking for transport
 smtp transport entered
   extchange@???
 hostlist:
@@ -61,7 +58,6 @@ no messages waiting for 127.0.0.1
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>
-local-accept-delivery forked for transport: npppp
 Leaving smtp transport
 LOG: MAIN
   => extchange@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
diff --git a/test/stderr/4520 b/test/stderr/4520
index 52f6792..6087e66 100644
--- a/test/stderr/4520
+++ b/test/stderr/4520
@@ -3,19 +3,15 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
-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
 admin user
 dropping to exim gid; retaining priv uid
-local-accept-delivery forking for transport
 Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ...  connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
-local-accept-delivery forked for transport: npppp
   SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
          250-SIZE 52428800
          250-8BITMIME
diff --git a/test/stderr/5000 b/test/stderr/5000
index d18a8d7..6ab026b 100644
--- a/test/stderr/5000
+++ b/test/stderr/5000
@@ -4,8 +4,6 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
-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
@@ -13,7 +11,6 @@ admin user
 dropping to exim gid; retaining priv uid

>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-local-accept-delivery forking for delivery-local
appendfile transport entered
appendfile: mode=600 notify_comsat=0 quota=20480 warning=0
directory=TESTSUITE/test-mail format=maildir
@@ -46,7 +43,6 @@ mailbox quota exceeded
maildir: time since "new" directory modified = 10s
Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex
appendfile yields 1 with errno=-22 more_errno=dd
-local-accept-delivery forked for delivery-local: npppp
maildir_taggedX_appendfile transport returned DEFER for userx@???
added retry item for T:userx@???: errno=-22 more_errno=dd flags=0
LOG: MAIN
diff --git a/test/stderr/5004 b/test/stderr/5004
index 6735a56..dde3a48 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -46,9 +46,7 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept-delivery
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
-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
@@ -97,7 +95,6 @@ rda_interpret (string): '# Exim filter\nsave TESTSUITE/test-mail'
expanded: '# Exim filter
save TESTSUITE/test-mail'
search_tidyup called
-local-accept-delivery forking for router-interpret
changed uid/gid: r1 router (recipient is userx@???)
uid=CALLER_UID gid=CALLER_GID pid=pppp
turned off address rewrite logging (not root or exim in this process)
@@ -106,7 +103,6 @@ Filter: start of processing
Filter: end of processing
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
-local-accept-delivery forked for router-interpret: npppp
rda_interpret: subprocess yield=0 error=NULL
set transport t1
r1 router generated TESTSUITE/test-mail
@@ -143,7 +139,6 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-local-accept-delivery forking for delivery-local
changed uid/gid: local delivery to TESTSUITE/test-mail <TESTSUITE/test-mail> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -166,7 +161,6 @@ renaming temporary file
renamed tmp/MAILDIR.mail.test.ex as new/MAILDIR.mail.test.ex
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
journalling TESTSUITE/test-mail:userx@???
t1 transport returned OK for TESTSUITE/test-mail
post-process TESTSUITE/test-mail (0)
diff --git a/test/stderr/5005 b/test/stderr/5005
index 80e4ba9..4941a29 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -44,9 +44,7 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept-delivery
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
-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
@@ -116,7 +114,6 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-local-accept-delivery forking for delivery-local
changed uid/gid: local delivery to nofile <nofile@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -158,7 +155,6 @@ renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
journalling nofile@???
t1 transport returned OK for nofile@???
post-process nofile@??? (0)
@@ -236,9 +232,7 @@ Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
search_tidyup called
-fresh-exec forking for local-accept-delivery
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
-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
@@ -307,7 +301,6 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-local-accept-delivery forking for delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -351,7 +344,6 @@ renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
@@ -429,9 +421,7 @@ Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
search_tidyup called
-fresh-exec forking for local-accept-delivery
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaZ-0005vi-00
-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
@@ -500,7 +490,6 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-local-accept-delivery forking for delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -539,7 +528,6 @@ maildir: time since "new" directory modified = 10s
Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex
appendfile yields 1 with errno=-22 more_errno=dd
search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
t1 transport returned DEFER for userx@???
added retry item for T:userx@???: errno=-22 more_errno=dd flags=0
post-process userx@??? (1)
@@ -631,9 +619,7 @@ Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
search_tidyup called
-fresh-exec forking for local-accept-delivery
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmbA-0005vi-00
-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
@@ -710,7 +696,6 @@ retry record exists: age=ttt (max 1w)
EXIM_DBCLOSE(0xAAAAAAAA)
closed hints database and lockfile
search_tidyup called
-local-accept-delivery forking for delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -736,7 +721,6 @@ maildir: time since "new" directory modified = 10s
Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex
appendfile yields 1 with errno=-22 more_errno=dd
search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
t1 transport returned DEFER for userx@???
added retry item for T:userx@???: errno=-22 more_errno=dd flags=0
post-process userx@??? (1)
diff --git a/test/stderr/5006 b/test/stderr/5006
index 405c1c4..309bd40 100644
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -44,9 +44,7 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept-delivery
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
-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
@@ -116,7 +114,6 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-local-accept-delivery forking for delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -156,7 +153,6 @@ renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
diff --git a/test/stderr/5008 b/test/stderr/5008
index 5e140d6..f4577c3 100644
--- a/test/stderr/5008
+++ b/test/stderr/5008
@@ -4,8 +4,6 @@ admin user
LOG: MAIN
<= CALLER@??? 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
@@ -13,7 +11,6 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-local-accept-delivery forking for delivery-local
appendfile transport entered
appendfile: mode=600 notify_comsat=0 quota=1048576 warning=0
directory=TESTSUITE/test-mail/userx format=maildir
@@ -34,7 +31,6 @@ writing data block fd=dddd size=sss timeout=0
renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
-local-accept-delivery forked for delivery-local: npppp
t1 transport returned OK for userx@???
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
@@ -47,8 +43,6 @@ configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-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
@@ -56,7 +50,6 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-local-accept-delivery forking for delivery-local
appendfile transport entered
appendfile: mode=600 notify_comsat=0 quota=1048576 warning=0
directory=TESTSUITE/test-mail/userx format=maildir
@@ -79,7 +72,6 @@ writing data block fd=dddd size=sss timeout=0
renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
-local-accept-delivery forked for delivery-local: npppp
t1 transport returned OK for userx@???
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
diff --git a/test/stderr/5204 b/test/stderr/5204
index ad7f6b7..81fede5 100644
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -16,8 +16,6 @@ checking domains
calling q router
q router called for "DECLINE cannot route this one (DECLINE)"@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for queryprogram-cmd
-fresh-exec forked for queryprogram-cmd: npppp
command wrote: DECLINE cannot route this one (DECLINE)
q router declined for "DECLINE cannot route this one (DECLINE)"@???
"more" is false: skipping remaining routers
@@ -39,8 +37,6 @@ checking domains
calling q router
q router called for "FAIL cannot route this one (FAIL)"@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for queryprogram-cmd
-fresh-exec forked for queryprogram-cmd: npppp
command wrote: FAIL cannot route this one (FAIL)
q router forced address failure
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
@@ -60,8 +56,6 @@ checking domains
calling q router
q router called for "ERROR cannot route this one (ERROR)"@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for queryprogram-cmd
-fresh-exec forked for queryprogram-cmd: npppp
command wrote: ERROR cannot route this one (ERROR)
LOG: PANIC
q router: bad command yield: ERROR cannot route this one (ERROR)
@@ -84,8 +78,6 @@ checking domains
calling q router
q router called for "DEFER cannot route this one (DEFER)"@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for queryprogram-cmd
-fresh-exec forked for queryprogram-cmd: npppp
command wrote: DEFER cannot route this one (DEFER)
q router: defer for "DEFER cannot route this one (DEFER)"@???
message: cannot route this one (DEFER)
@@ -106,8 +98,6 @@ checking domains
calling q router
q router called for "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for queryprogram-cmd
-fresh-exec forked for queryprogram-cmd: npppp
command wrote: ACCEPT transport = other_smtp hosts=ten-1.test.ex
finding IP address for ten-1.test.ex
doing DNS lookup
@@ -136,8 +126,6 @@ checking domains
calling q router
q router called for PASS@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for queryprogram-cmd
-fresh-exec forked for queryprogram-cmd: npppp
command wrote: PASS
q router passed for PASS@???
--------> s router <--------
@@ -178,8 +166,6 @@ checking domains
calling q router
q router called for "FREEZE cannot route this one (FREEZE)"@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for queryprogram-cmd
-fresh-exec forked for queryprogram-cmd: npppp
command wrote: FREEZE cannot route this one (FREEZE)
q router: defer for "FREEZE cannot route this one (FREEZE)"@???
message: cannot route this one (FREEZE)
@@ -200,8 +186,6 @@ checking domains
calling q router
q router called for "REDIRECT postmaster@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for queryprogram-cmd
-fresh-exec forked for queryprogram-cmd: npppp
command wrote: REDIRECT postmaster@???
rda_interpret (string): 'postmaster@???'
expanded: 'postmaster@???'
@@ -278,8 +262,6 @@ q router called for "FAIL cannot route this one (FAIL)"@???: domain = some
requires uid=CALLER_UID gid=CALLER_GID current_directory=/
not running as root: cannot change uid/gid
subprocess will run with uid=EXIM_UID gid=EXIM_GID
-fresh-exec forking for queryprogram-cmd
-fresh-exec forked for queryprogram-cmd: npppp
command wrote: FAIL cannot route this one (FAIL)
q router forced address failure
----------- end verify ------------

Diese Nachricht ist Teil des folgenden Threads:
	Der komplette Thread sortiert nach Datum