[exim-cvs] Testsuite: ignore fakens fork debug line, avoidi…

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Exim Git Commits Mailing List
Datum:  
To: exim-cvs
Betreff: [exim-cvs] Testsuite: ignore fakens fork debug line, avoiding ipv6-support differences
Gitweb: https://git.exim.org/exim.git/commitdiff/836c3e4102dae52604590a6674bec10087dbf17e
Commit:     836c3e4102dae52604590a6674bec10087dbf17e
Parent:     d06f582fd0714042fcc110c9e0f7665657bb9da5
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Mar 28 16:06:48 2020 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sat Mar 28 16:06:48 2020 +0000


    Testsuite: ignore fakens fork debug line, avoiding ipv6-support differences
---
 test/runtest     |   5 ++-
 test/stderr/0002 |  18 ----------
 test/stderr/0021 |   2 --
 test/stderr/0037 |   5 +--
 test/stderr/0044 |   9 -----
 test/stderr/0078 |  60 --------------------------------
 test/stderr/0094 |  15 --------
 test/stderr/0117 |  63 ---------------------------------
 test/stderr/0143 |   4 +--
 test/stderr/0161 |  84 --------------------------------------------
 test/stderr/0169 |   4 +--
 test/stderr/0183 |  63 ---------------------------------
 test/stderr/0218 |  79 +++++++++++++-----------------------------
 test/stderr/0264 |   1 -
 test/stderr/0275 |   6 ++--
 test/stderr/0277 |  12 -------
 test/stderr/0278 |  15 ++------
 test/stderr/0283 |  13 ++-----
 test/stderr/0315 |  29 ++--------------
 test/stderr/0332 |  16 +++------
 test/stderr/0333 |  10 ++----
 test/stderr/0357 |  19 ++++------
 test/stderr/0358 |  10 ++----
 test/stderr/0360 |  22 ++----------
 test/stderr/0361 |  18 ++--------
 test/stderr/0364 |  27 ---------------
 test/stderr/0368 |  51 ---------------------------
 test/stderr/0370 |   6 +---
 test/stderr/0374 |  30 +++-------------
 test/stderr/0375 |  49 +++++---------------------
 test/stderr/0377 |  10 ++----
 test/stderr/0378 |  21 +++--------
 test/stderr/0379 |   6 +---
 test/stderr/0380 |   2 --
 test/stderr/0381 |  15 --------
 test/stderr/0382 |   6 +---
 test/stderr/0386 |  18 +++-------
 test/stderr/0388 |   9 ++---
 test/stderr/0393 |  16 +++------
 test/stderr/0402 |  18 ++++------
 test/stderr/0403 |   6 ++--
 test/stderr/0404 |  18 ++++------
 test/stderr/0408 |   6 ++--
 test/stderr/0419 |  15 --------
 test/stderr/0426 |  15 +-------
 test/stderr/0433 |  18 ++++------
 test/stderr/0437 |  12 +++----
 test/stderr/0438 |   9 ++---
 test/stderr/0450 |  10 ++----
 test/stderr/0463 |  24 -------------
 test/stderr/0469 |   6 ----
 test/stderr/0476 |  21 ++++-------
 test/stderr/0487 |   6 ++--
 test/stderr/0499 |  12 -------
 test/stderr/0512 |  16 +++------
 test/stderr/0529 |   5 +--
 test/stderr/0543 |  13 ++-----
 test/stderr/0544 |   4 +--
 test/stderr/0545 |  33 ------------------
 test/stderr/0554 |   6 ++--
 test/stderr/0609 |  18 +++++-----
 test/stderr/1006 |  39 ---------------------
 test/stderr/1007 |  24 +++++--------
 test/stderr/2013 | 104 ++++++++++++++++---------------------------------------
 test/stderr/2035 |   8 ++---
 test/stderr/2113 |  46 ------------------------
 test/stderr/2135 |   4 ---
 test/stderr/2200 |   9 -----
 test/stderr/2201 |  35 -------------------
 test/stderr/2202 |  12 -------
 test/stderr/2600 |   2 --
 test/stderr/2610 |   2 --
 test/stderr/2620 |   2 --
 test/stderr/4052 |   2 --
 test/stderr/4520 |   5 ---
 test/stderr/4802 |  18 ----------
 test/stderr/4803 |  18 ----------
 test/stderr/5000 |   2 --
 test/stderr/5004 |   3 --
 test/stderr/5005 |   8 -----
 test/stderr/5006 |   2 --
 test/stderr/5008 |   4 ---
 test/stderr/5204 |  15 --------
 test/stdout/0601 |   2 +-
 84 files changed, 198 insertions(+), 1307 deletions(-)


diff --git a/test/runtest b/test/runtest
index c381d6d..6e6ed40 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1047,9 +1047,12 @@ 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/;
-    s/^(?:\s*\d+ )(postfork: )/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/;


+
     # IP address lookups use gethostbyname() when IPv6 is not supported,
     # and gethostbyname2() or getipnodebyname() when it is.


diff --git a/test/stderr/0002 b/test/stderr/0002
index 995a193..7dd84d8 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -264,16 +264,7 @@ dropping to exim gid; retaining priv uid
╰─────result: ----> No lookup yet: No
╭considering: -oMs sender_host_name = $sender_host_name
looking up host name for V4NET.0.0.1
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
IP address lookup yielded "ten-1.test.ex"
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
checking addresses for ten-1.test.ex
V4NET.0.0.1 OK
@@ -315,18 +306,9 @@ check hosts = <\n partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch \n 1.2.3.4
sender host name required, to match against partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch
looking up host name for V4NET.0.0.1
DNS lookup of 1.0.0.V4NET.in-addr.arpa (PTR) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of 1.0.0.V4NET.in-addr.arpa (PTR) succeeded
IP address lookup yielded "ten-1.test.ex"
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
checking addresses for ten-1.test.ex
diff --git a/test/stderr/0021 b/test/stderr/0021
index 96bf58e..c752fb7 100644
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -187,7 +187,6 @@ 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
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -196,7 +195,6 @@ admin user
dropping to exim gid; retaining priv uid
x in "!bad"? yes (end of list)
local-accept-delivery forking for delivery-local
-postfork: delivery-local
local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> x <x@y> R=accept T=appendfile
diff --git a/test/stderr/0037 b/test/stderr/0037
index 127db67..a300abb 100644
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -5,7 +5,6 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -45,13 +44,12 @@ 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
-postfork: router-interpret
+local-accept-delivery forked for router-interpret: npppp
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
@@ -109,7 +107,6 @@ After routing:
Deferred addresses:
locking TESTSUITE/spool/db/retry.lockfile
local-accept-delivery forking for delivery-local
-postfork: delivery-local
local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> userx <filter-userx@???> R=user_accept2 T=appendfile
diff --git a/test/stderr/0044 b/test/stderr/0044
index 275ba99..34efe61 100644
--- a/test/stderr/0044
+++ b/test/stderr/0044
@@ -78,16 +78,10 @@ check dnslists = rbl.test.ex
dnslists check: rbl.test.ex
new DNS lookup for 13.12.11.V4NET.rbl.test.ex
DNS lookup of 13.12.11.V4NET.rbl.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of 13.12.11.V4NET.rbl.test.ex (A) succeeded
dnslists: wrote cache entry, ttl=3
DNS lookup for 13.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) succeeded
=> that means V4NET.11.12.13 is listed at rbl.test.ex
deny: condition test succeeded in ACL "check_recipient"
@@ -244,9 +238,6 @@ check dnslists = rbl.test.ex
dnslists check: rbl.test.ex
new DNS lookup for 99.99.99.V4NET.rbl.test.ex
DNS lookup of 99.99.99.V4NET.rbl.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of 99.99.99.V4NET.rbl.test.ex (A) gave HOST_NOT_FOUND
returning DNS_NOMATCH
faking res_search(A) response length as 65535
diff --git a/test/stderr/0078 b/test/stderr/0078
index fafb81e..5f08f68 100644
--- a/test/stderr/0078
+++ b/test/stderr/0078
@@ -10,27 +10,6 @@ checking domains
calling lookuphost router
lookuphost router called for xx@???
domain = mxt6.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
set transport remote_smtp
queued for remote_smtp transport: local_part = xx
domain = mxt6.test.ex
@@ -53,15 +32,6 @@ checking domains
calling lookuphost router
lookuphost router called for myhost.test.ex@???
domain = mxt1.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
lookuphost router passed for myhost.test.ex@???
--------> self router <--------
@@ -77,12 +47,6 @@ expanded list of hosts = 'myhost.test.ex' options = 'byname'
set transport remote_smtp
finding IP address for myhost.test.ex
calling host_find_byname
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
queued for remote_smtp transport: local_part = myhost.test.ex
domain = mxt1.test.ex
errors_to=NULL
@@ -104,15 +68,6 @@ checking domains
calling lookuphost router
lookuphost router called for xx@???
domain = mxt1.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
lookuphost router passed for xx@???
--------> self router <--------
@@ -128,12 +83,6 @@ expanded list of hosts = 'xx' options = 'byname'
set transport remote_smtp
finding IP address for xx
calling host_find_byname
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
self router passed for xx@???
--------> self2 router <--------
local_part=xx domain=mxt1.test.ex
@@ -148,12 +97,6 @@ expanded list of hosts = 'myhost.test.ex' options = 'byname'
set transport remote_smtp
finding IP address for myhost.test.ex
calling host_find_byname
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
queued for remote_smtp transport: local_part = xx
domain = mxt1.test.ex
errors_to=NULL
@@ -175,9 +118,6 @@ checking domains
calling lookuphost router
lookuphost router called for xx@???
domain = not.exist
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
lookuphost router declined for xx@???
"more" is false: skipping remaining routers
no more routers
diff --git a/test/stderr/0094 b/test/stderr/0094
index 355c68b..eec1125 100644
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -80,31 +80,16 @@ LOG: smtp_connection MAIN
host in host_lookup? yes (matched "0.0.0.0/0")
looking up host name for V4NET.99.99.90
DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) succeeded
IP address lookup yielded "oneback.test.ex"
alias "host1.masq.test.ex"
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of oneback.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of oneback.test.ex (A) succeeded
oneback.test.ex V4NET.99.99.90 mx=-1 sort=xx
checking addresses for oneback.test.ex
Forward DNS security status: unverified
V4NET.99.99.90 OK
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of host1.masq.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of host1.masq.test.ex (A) succeeded
host1.masq.test.ex V4NET.90.90.90 mx=-1 sort=xx
checking addresses for host1.masq.test.ex
diff --git a/test/stderr/0117 b/test/stderr/0117
index 6b40b82..b400e22 100644
--- a/test/stderr/0117
+++ b/test/stderr/0117
@@ -8,27 +8,6 @@ local_part=xxx domain=mxt9.test.ex
calling lookuphost router
lookuphost router called for xxx@???
domain = mxt9.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
queued for <unset> transport: local_part = xxx
domain = mxt9.test.ex
errors_to=NULL
@@ -50,27 +29,6 @@ local_part=xxx domain=mxt9a.test.ex
calling lookuphost router
lookuphost router called for xxx@???
domain = mxt9a.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
queued for <unset> transport: local_part = xxx
domain = mxt9a.test.ex
errors_to=NULL
@@ -92,27 +50,6 @@ local_part=xxx domain=mxt9b.test.ex
calling lookuphost router
lookuphost router called for xxx@???
domain = mxt9b.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
queued for <unset> transport: local_part = xxx
domain = mxt9b.test.ex
errors_to=NULL
diff --git a/test/stderr/0143 b/test/stderr/0143
index 15f53cc..07fd508 100644
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -5,7 +5,6 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -16,7 +15,7 @@ router_name <my_main_router>
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>

--------> userx@??? <--------
local-accept-delivery forking for transport
-postfork: transport
+local-accept-delivery forked for transport: npppp
transport_name <my_smtp>
my_smtp transport entered
userx@???
@@ -56,7 +55,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/0161 b/test/stderr/0161
index b3eb4ea..9ace15f 100644
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -15,27 +15,6 @@ checking domains
calling lookuphost router
lookuphost router called for xx@???
domain = mxt6.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
set transport remote_smtp
queued for remote_smtp transport: local_part = xx
domain = mxt6.test.ex
@@ -63,15 +42,6 @@ checking domains
calling lookuphost router
lookuphost router called for myhost.test.ex@???
domain = mxt1.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
lookuphost router passed for myhost.test.ex@???
--------> fail router <--------
@@ -92,12 +62,6 @@ expanded list of hosts = 'myhost.test.ex' options = 'byname'
set transport remote_smtp
finding IP address for myhost.test.ex
calling host_find_byname
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
queued for remote_smtp transport: local_part = myhost.test.ex
domain = mxt1.test.ex
errors_to=NULL
@@ -124,15 +88,6 @@ checking domains
calling lookuphost router
lookuphost router called for xx@???
domain = mxt1.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
lookuphost router passed for xx@???
--------> fail router <--------
@@ -153,12 +108,6 @@ expanded list of hosts = 'xx' options = 'byname'
set transport remote_smtp
finding IP address for xx
calling host_find_byname
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
self router passed for xx@???
--------> self2 router <--------
local_part=xx domain=mxt1.test.ex
@@ -173,12 +122,6 @@ expanded list of hosts = 'myhost.test.ex' options = 'byname'
set transport remote_smtp
finding IP address for myhost.test.ex
calling host_find_byname
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
queued for remote_smtp transport: local_part = xx
domain = mxt1.test.ex
errors_to=NULL
@@ -205,9 +148,6 @@ checking domains
calling lookuphost router
lookuphost router called for xx@???
domain = not.exist
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
lookuphost router declined for xx@???
"more" is false: skipping remaining routers
no more routers
@@ -225,15 +165,6 @@ checking local_parts
calling failuphost router
failuphost router called for ff@???
domain = mxt1.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
lowest numbered MX record points to local host: mxt1.test.ex: address failed (self = fail)
failuphost router forced address failure
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>

@@ -254,15 +185,6 @@ checking domains
calling lookuphost router
lookuphost router called for fff@???
domain = mxt1.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
lookuphost router passed for fff@???
--------> fail router <--------
@@ -279,11 +201,5 @@ expanded list of hosts = 'fff' options = 'byname'
set transport remote_smtp
finding IP address for fff
calling host_find_byname
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
fail router forced address failure
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0169 b/test/stderr/0169
index f64cb79..4029767 100644
--- a/test/stderr/0169
+++ b/test/stderr/0169
@@ -4,7 +4,6 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -14,7 +13,7 @@ dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>

--------> userx@??? <--------
local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
appendfile transport entered
appendfile: mode=600 notify_comsat=0 quota=52428800 warning=41%
file=TESTSUITE/test-mail/userx format=unix
@@ -35,7 +34,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/0183 b/test/stderr/0183
index 6e18963..a6a0ad5 100644
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -32,9 +32,6 @@ lookuphost router called for userx@???
domain = test.again.dns
test.again.dns in "*"? yes (matched "*")
DNS lookup of test.again.dns (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of test.again.dns (MX) gave TRY_AGAIN
test.again.dns in dns_again_means_nonexist? no (option unset)
returning DNS_AGAIN
@@ -93,18 +90,12 @@ lookuphost router called for abcd@???
domain = ten-1.test.ex
ten-1.test.ex in "*"? yes (matched "*")
DNS lookup of ten-1.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
ten-1.test.ex (MX resp) DNSSEC
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
@@ -144,9 +135,6 @@ finding IP address for test.again.dns
doing DNS lookup
test.again.dns in "*"? yes (matched "*")
DNS lookup of test.again.dns (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of test.again.dns (A) gave TRY_AGAIN
test.again.dns in dns_again_means_nonexist? no (option unset)
returning DNS_AGAIN
@@ -207,9 +195,6 @@ lookuphost router called for xyz@???
ten-1.test.ex in "*"? yes (matched "*")
DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
@@ -257,9 +242,6 @@ lookuphost router called for userx@???
domain = test.fail.dns
test.fail.dns in "*"? yes (matched "*")
DNS lookup of test.fail.dns (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of test.fail.dns (MX) gave NO_RECOVERY
returning DNS_FAIL
writing neg-cache entry for test.fail.dns-MX-xxxx, ttl -1
@@ -317,18 +299,12 @@ lookuphost router called for abcd@???
domain = ten-1.test.ex
ten-1.test.ex in "*"? yes (matched "*")
DNS lookup of ten-1.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
ten-1.test.ex (MX resp) DNSSEC
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
@@ -368,9 +344,6 @@ finding IP address for test.fail.dns
doing DNS lookup
test.fail.dns in "*"? yes (matched "*")
DNS lookup of test.fail.dns (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of test.fail.dns (A) gave NO_RECOVERY
returning DNS_FAIL
writing neg-cache entry for test.fail.dns-A-xxxx, ttl -1
@@ -430,9 +403,6 @@ lookuphost router called for xyz@???
ten-1.test.ex in "*"? yes (matched "*")
DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
@@ -480,9 +450,6 @@ lookuphost router called for userx@???
domain = nonexist.test.ex
nonexist.test.ex in "*"? yes (matched "*")
DNS lookup of nonexist.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of nonexist.test.ex (MX) gave HOST_NOT_FOUND
returning DNS_NOMATCH
faking res_search(MX) response length as 65535
@@ -543,18 +510,12 @@ lookuphost router called for abcd@???
domain = ten-1.test.ex
ten-1.test.ex in "*"? yes (matched "*")
DNS lookup of ten-1.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
ten-1.test.ex (MX resp) DNSSEC
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
@@ -594,9 +555,6 @@ finding IP address for nonexist.test.ex
doing DNS lookup
nonexist.test.ex in "*"? yes (matched "*")
DNS lookup of nonexist.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of nonexist.test.ex (A) gave HOST_NOT_FOUND
returning DNS_NOMATCH
faking res_search(A) response length as 65535
@@ -657,9 +615,6 @@ lookuphost router called for xyz@???
ten-1.test.ex in "*"? yes (matched "*")
DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
@@ -697,9 +652,6 @@ srv router called for srv@???
domain = test.again.dns
test.again.dns in "*"? yes (matched "*")
DNS lookup of _smtp._tcp.test.again.dns (SRV) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of _smtp._tcp.test.again.dns (SRV) gave TRY_AGAIN
_smtp._tcp.test.again.dns in dns_again_means_nonexist? no (option unset)
returning DNS_AGAIN
@@ -722,27 +674,18 @@ srv router called for srv@???
domain = test.fail.dns
test.fail.dns in "*"? yes (matched "*")
DNS lookup of _smtp._tcp.test.fail.dns (SRV) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of _smtp._tcp.test.fail.dns (SRV) gave NO_RECOVERY
returning DNS_FAIL
writing neg-cache entry for _smtp._tcp.test.fail.dns-SRV-xxxx, ttl -1
test.fail.dns in "test.fail.dns"? yes (matched "test.fail.dns")
DNS_FAIL treated as DNS_NODATA (domain in srv_fail_domains)
DNS lookup of test.fail.dns (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of test.fail.dns (MX) gave NO_RECOVERY
returning DNS_FAIL
writing neg-cache entry for test.fail.dns-MX-xxxx, ttl -1
test.fail.dns in "test.fail.dns"? yes (matched "test.fail.dns")
DNS_FAIL treated as DNS_NODATA (domain in mx_fail_domains)
DNS lookup of test.fail.dns (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of test.fail.dns (A) gave NO_RECOVERY
returning DNS_FAIL
writing neg-cache entry for test.fail.dns-A-xxxx, ttl -1
@@ -784,9 +727,6 @@ lookuphost router called for userx@???
domain = nonexist.example.com
nonexist.example.com in "*"? yes (matched "*")
DNS lookup of nonexist.example.com (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
returning DNS_NOMATCH
faking res_search(MX) response length as 65535
@@ -831,9 +771,6 @@ delay router called for userd@???
nonexist.example.com in "*"? yes (matched "*")
DNS lookup of nonexist.example.com-MX: cached value DNS_NOMATCH past valid time
DNS lookup of nonexist.example.com (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
returning DNS_NOMATCH
faking res_search(MX) response length as 65535
diff --git a/test/stderr/0218 b/test/stderr/0218
index a2ae61e..bbf2b52 100644
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -8,33 +8,29 @@ LOG: queue_run MAIN
queue running combined directories
looking in TESTSUITE/spool//input
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
delivering 10HmaX-0005vi-00 (queue run pid ppppp)
R: client (ACL)
qrun-delivery forking for transport
-postfork: transport
-T: send_to_server (ACL)
-fresh-exec forked for qrun-delivery: npppp
qrun-delivery forked for transport: npppp
+T: send_to_server (ACL)
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
delivering 10HmaY-0005vi-00 (queue run pid ppppp)
R: client (ACL)
qrun-delivery forking for transport
-postfork: transport
-T: send_to_server (ACL)
-fresh-exec forked for qrun-delivery: npppp
qrun-delivery forked for transport: npppp
+T: send_to_server (ACL)
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

queue running combined directories
looking in TESTSUITE/spool//input
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
delivering 10HmaX-0005vi-00 (queue run pid ppppp)
R: client (ACL)
qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
T: send_to_server (ACL)
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
@@ -50,12 +46,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP>> writing message and terminating "."
SMTP<< 250 OK
transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: 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 forking for continued-transport
continued-transport-interproc forked for continued-transport: npppp
SMTP(close)>>
LOG: MAIN
@@ -71,12 +63,11 @@ dropping to exim gid; retaining priv uid
delivering 10HmaY-0005vi-00 (queue run pid ppppp)
R: client (ACL)
continued-transport forking for transport
-postfork: transport
+continued-transport forked for transport: npppp
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
@@ -102,33 +93,29 @@ LOG: queue_run MAIN
queue running combined directories
looking in TESTSUITE/spool//input
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
R: client (ACL)
qrun-delivery forking for transport
-postfork: transport
-T: send_to_server (ACL)
-fresh-exec forked for qrun-delivery: npppp
qrun-delivery forked for transport: npppp
+T: send_to_server (ACL)
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
qrun-delivery forking for transport
-postfork: transport
-T: send_to_server (ACL)
-fresh-exec forked for qrun-delivery: npppp
qrun-delivery forked for transport: npppp
+T: send_to_server (ACL)
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

queue running combined directories
looking in TESTSUITE/spool//input
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
R: client (ACL)
qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
T: send_to_server (ACL)
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
@@ -143,12 +130,9 @@ 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
-postfork: bounce-message
qrun-delivery forked for bounce-message: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -161,17 +145,15 @@ LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
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 >>>>>>>>>>>>>>>>

@@ -185,17 +167,15 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
qrun-delivery forking for transport
-postfork: transport
-T: send_to_server (ACL)
-fresh-exec forked for qrun-delivery: npppp
qrun-delivery forked for transport: npppp
+T: send_to_server (ACL)
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
delivering 10HmbB-0005vi-00 (queue run pid ppppp)
R: bounce (ACL)
LOG: MAIN
@@ -205,23 +185,20 @@ 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
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
delivering 10HmbC-0005vi-00 (queue run pid ppppp)
R: client (ACL)
qrun-delivery forking for transport
-postfork: transport
-T: send_to_server (ACL)
-fresh-exec forked for qrun-delivery: npppp
qrun-delivery forked for transport: npppp
+T: send_to_server (ACL)
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
T: send_to_server (ACL)
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
@@ -237,18 +214,13 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP>> RSET
SMTP<< 250 OK
transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: 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 forking for continued-transport
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
-postfork: bounce-message
qrun-delivery forked for bounce-message: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -268,12 +240,11 @@ dropping to exim gid; retaining priv uid
delivering 10HmbC-0005vi-00 (queue run pid ppppp)
R: client (ACL)
continued-transport forking for transport
-postfork: transport
+continued-transport forked for transport: npppp
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 055b67a..57b377c 100644
--- a/test/stderr/0264
+++ b/test/stderr/0264
@@ -10,7 +10,6 @@ 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
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
diff --git a/test/stderr/0275 b/test/stderr/0275
index 52536e3..965fc8c 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -145,9 +145,8 @@ LOG: MAIN
created log directory TESTSUITE/spool/log
search_tidyup called
fresh-exec forking for local-accept-delivery
-postfork: 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
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -290,7 +289,7 @@ search_tidyup called
no retry data available
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -303,7 +302,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/0277 b/test/stderr/0277
index 7132101..1c81cc7 100644
--- a/test/stderr/0277
+++ b/test/stderr/0277
@@ -16,9 +16,6 @@ host in "V4NET.2.3.4"? yes (matched "V4NET.2.3.4")
host in host_lookup? yes (matched "+lookup_hosts")
looking up host name for V4NET.2.3.4
DNS lookup of 4.3.2.V4NET.in-addr.arpa (PTR) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of 4.3.2.V4NET.in-addr.arpa (PTR) gave HOST_NOT_FOUND
returning DNS_NOMATCH
DNS: no SOA record found for neg-TTL
@@ -97,9 +94,6 @@ host in "V4NET.6.7.8"? no (end of list)
host in host_lookup? yes (end of list)
looking up host name for V4NET.10.11.12
DNS lookup of 12.11.10.V4NET.in-addr.arpa (PTR) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of 12.11.10.V4NET.in-addr.arpa (PTR) gave HOST_NOT_FOUND
returning DNS_NOMATCH
DNS: no SOA record found for neg-TTL
@@ -145,9 +139,6 @@ host in "V4NET.6.7.8"? no (end of list)
host in host_lookup? yes (end of list)
looking up host name for V4NET.1.1.1
DNS lookup of 1.1.1.V4NET.in-addr.arpa (PTR) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of 1.1.1.V4NET.in-addr.arpa (PTR) gave HOST_NOT_FOUND
returning DNS_NOMATCH
DNS: no SOA record found for neg-TTL
@@ -193,9 +184,6 @@ host in "V4NET.6.7.8"? no (end of list)
host in host_lookup? yes (end of list)
looking up host name for V4NET.2.2.2
DNS lookup of 2.2.2.V4NET.in-addr.arpa (PTR) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of 2.2.2.V4NET.in-addr.arpa (PTR) gave HOST_NOT_FOUND
returning DNS_NOMATCH
DNS: no SOA record found for neg-TTL
diff --git a/test/stderr/0278 b/test/stderr/0278
index bea5f64..58fb5e3 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -104,9 +104,8 @@ LOG: MAIN
created log directory TESTSUITE/spool/log
search_tidyup called
fresh-exec forking for local-accept-delivery
-postfork: 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
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -204,7 +203,7 @@ search_tidyup called
no retry data available
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
changed uid/gid: local delivery to CALLER <CALLER@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=CALLER_HOME current=CALLER_HOME
@@ -217,7 +216,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)
@@ -296,21 +294,12 @@ r2 router called for unknown@???
domain = test.ex
test.ex in "*"? yes (matched "*")
DNS lookup of test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for test.ex-MX-xxxx, ttl 3000
test.ex (MX resp) DNSSEC
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of test.ex (A) gave NO_DATA
returning DNS_NODATA
faking res_search(A) response length as 65535
diff --git a/test/stderr/0283 b/test/stderr/0283
index 9b70f1d..9f8da08 100644
--- a/test/stderr/0283
+++ b/test/stderr/0283
@@ -15,7 +15,6 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
@@ -31,15 +30,12 @@ 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
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
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
-postfork: 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
-postfork: pipe-tpt-output
delivery-local forked for pipe-tpt-output: npppp
transport error EPIPE ignored
LOG: MAIN
@@ -47,7 +43,6 @@ LOG: MAIN
changed uid/gid: post-delivery tidying
uid=EXIM_UID gid=EXIM_GID pid=pppp
local-accept-delivery forking for bounce-message
-postfork: bounce-message
local-accept-delivery forked for bounce-message: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
@@ -66,7 +61,6 @@ 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
-postfork: local-accept-delivery
bounce-message forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
@@ -82,10 +76,9 @@ 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
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
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
@@ -114,7 +107,6 @@ getpwnam() succeeded uid=uuuu gid=gggg
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
@@ -132,7 +124,6 @@ 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
-postfork: 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
diff --git a/test/stderr/0315 b/test/stderr/0315
index f3bad37..b5e05ee 100644
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -5,7 +5,6 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -31,15 +30,6 @@ checking domains
calling r1 router
r1 router called for y@???
domain = ten-1.test.ex
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
set transport t1
queued for t1 transport: local_part = y
domain = ten-1.test.ex
@@ -61,9 +51,8 @@ After routing:
Failed addresses:
Deferred addresses:
local-accept-delivery forking for transport
-postfork: transport
-locking TESTSUITE/spool/db/retry.lockfile
local-accept-delivery forked for transport: npppp
+locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
*> x@??? R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
LOG: MAIN
@@ -78,7 +67,6 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -107,15 +95,6 @@ local_part=y domain=ten-2.test.ex
calling r2 router
r2 router called for y@???
domain = ten-2.test.ex
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
set transport t1
queued for t1 transport: local_part = y
domain = ten-2.test.ex
@@ -136,9 +115,6 @@ local_part=x domain=ten-2.test.ex
calling r2 router
r2 router called for x@???
domain = ten-2.test.ex
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
queued for t1 transport: local_part = x
domain = ten-2.test.ex
errors_to=NULL
@@ -156,9 +132,8 @@ After routing:
Failed addresses:
Deferred addresses:
local-accept-delivery forking for transport
-postfork: transport
-locking TESTSUITE/spool/db/retry.lockfile
local-accept-delivery forked for transport: npppp
+locking TESTSUITE/spool/db/retry.lockfile
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 388a29d..197af3f 100644
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -5,7 +5,7 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 Considering: ok@???
@@ -35,16 +35,12 @@ After routing:
   Failed addresses:
   Deferred addresses:
 qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: 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 forking for continued-transport
 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"
@@ -91,15 +87,14 @@ After routing:
   Deferred addresses:
     delay@???
 continued-transport forking for transport
-postfork: transport
-locking TESTSUITE/spool/db/retry.lockfile
 continued-transport forked for transport: npppp
+locking TESTSUITE/spool/db/retry.lockfile
 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
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 Considering: delay@???
@@ -114,7 +109,6 @@ After routing:
   Deferred addresses:
     delay@???

>>>>>>>>>>>>>>>> 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/0333 b/test/stderr/0333
index 21bac83..3960566 100644
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -31,15 +31,12 @@ After routing:
   Failed addresses:
   Deferred addresses:
 fresh-exec forking for transport
-postfork: transport
+fresh-exec forked for transport: npppp
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
-fresh-exec forked for transport: npppp
 transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forking for continued-transport
 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"
@@ -86,9 +83,8 @@ After routing:
   Deferred addresses:
     delay@???
 continued-transport forking for transport
-postfork: transport
-locking TESTSUITE/spool/db/retry.lockfile
 continued-transport forked for transport: npppp
+locking TESTSUITE/spool/db/retry.lockfile
 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 619ee4a..bde398c 100644
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -26,12 +25,11 @@ After routing:
   Failed addresses:
   Deferred addresses:
 local-accept-delivery forking for transport
-postfork: transport
+local-accept-delivery forked for transport: npppp
 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
@@ -57,7 +55,7 @@ dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
 locking TESTSUITE/spool/db/retry.lockfile

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

Considering: userx@???
@@ -74,14 +72,12 @@ After routing:
Failed addresses:
Deferred addresses:
qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
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
@@ -120,7 +116,7 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

Considering: userx@???
@@ -137,14 +133,12 @@ After routing:
Failed addresses:
Deferred addresses:
qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
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
@@ -183,7 +177,7 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

Considering: userx@???
@@ -208,7 +202,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 90758b2..9208e42 100644
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -5,7 +5,6 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -31,13 +30,12 @@ After routing:
Failed addresses:
Deferred addresses:
local-accept-delivery forking for transport
-postfork: transport
+local-accept-delivery forked for transport: npppp
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
@@ -73,7 +71,7 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 Considering: userx@???
@@ -98,15 +96,13 @@ After routing:
   Failed addresses:
   Deferred addresses:
 qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
 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 2d7e6aa..cad2871 100644
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -106,19 +105,7 @@ checking domains
 calling r1 router
 r1 router called for unknown@???
   domain = recurse.test.ex
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
 r1 router widened recurse.test.ex to recurse.test.ex.test.ex
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
 domain changed to recurse.test.ex.test.ex
 rewriting header lines
 re-routed to unknown@???
@@ -139,9 +126,6 @@ checking domains
 calling r1 router
 r1 router called for unknown@???
   domain = recurse.test.ex.test.ex
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
 set transport t1
 queued for t1 transport: local_part = unknown
 domain = recurse.test.ex.test.ex
@@ -161,9 +145,8 @@ After routing:
   Deferred addresses:
     defer@???
 local-accept-delivery forking for transport
-postfork: transport
-locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forked for transport: npppp
+locking TESTSUITE/spool/db/retry.lockfile
 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 >>>>>>>>>>>>>>>>

@@ -175,7 +158,7 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

@@ -266,7 +249,6 @@ After routing:
   Deferred addresses:
     defer@???

>>>>>>>>>>>>>>>> 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/0361 b/test/stderr/0361
index b595778..475ffcc 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -51,9 +51,8 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
search_tidyup called
fresh-exec forking for local-accept-delivery
-postfork: 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 10HmaY-0005vi-00
fresh-exec forked for local-accept-delivery: npppp
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaY-0005vi-00
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -101,9 +100,6 @@ r1 router called for kilos@???
domain = recurse.test.ex
recurse.test.ex in "*"? yes (matched "*")
DNS lookup of recurse.test.ex (MX) using fakens
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
DNS lookup of recurse.test.ex (MX) gave HOST_NOT_FOUND
returning DNS_NOMATCH
faking res_search(MX) response length as 65535
@@ -111,21 +107,12 @@ faking res_search(MX) response length as 65535
r1 router widened recurse.test.ex to recurse.test.ex.test.ex
recurse.test.ex.test.ex in "*"? yes (matched "*")
DNS lookup of recurse.test.ex.test.ex (MX) using fakens
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
DNS lookup of recurse.test.ex.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for recurse.test.ex.test.ex-MX-xxxx, ttl 3000
recurse.test.ex.test.ex (MX resp) DNSSEC
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
DNS lookup of recurse.test.ex.test.ex (A) using fakens
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
DNS lookup of recurse.test.ex.test.ex (A) succeeded
fully qualified name = recurse.test.ex.test.ex
recurse.test.ex.test.ex V4NET.99.0.2 mx=-1 sort=xx
@@ -231,7 +218,7 @@ search_tidyup called
no retry data available
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
changed uid/gid: local delivery to kilos <kilos@???> transport=t2
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -245,7 +232,6 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
locking by lockfile fcntl
*** delivery by t2 transport bypassed by -N option
search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
journalling kilos@???/t2
t2 transport returned OK for kilos@???
post-process kilos@??? (0)
diff --git a/test/stderr/0364 b/test/stderr/0364
index 3e349bb..f3df336 100644
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -73,9 +73,6 @@ checking domains
calling r2 router
r2 router called for solik@???
domain = otherhost.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
r2 router declined for solik@???
--------> r3 router <--------
local_part=solik domain=otherhost.test.ex
@@ -102,9 +99,6 @@ checking domains
calling r2 router
r2 router called for solik@???
domain = otherhost.sub.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
r2 router declined for solik@???
--------> r3 router <--------
local_part=solik domain=otherhost.sub.test.ex
@@ -147,15 +141,6 @@ checking domains
calling r2 router
r2 router called for xxx@???
domain = ten-1.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
set transport t1
queued for t1 transport: local_part = xxx
domain = ten-1.test.ex
@@ -191,9 +176,6 @@ checking domains
calling r2 router
r2 router called for xxx@???
domain = testsub.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
r2 router declined for xxx@???
--------> r3 router <--------
local_part=xxx domain=testsub.test.ex
@@ -220,15 +202,6 @@ checking domains
calling r2 router
r2 router called for xxx@???
domain = testsub.sub.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
queued for t1 transport: local_part = xxx
domain = testsub.sub.test.ex
errors_to=NULL
diff --git a/test/stderr/0368 b/test/stderr/0368
index 5246e11..9bf935f 100644
--- a/test/stderr/0368
+++ b/test/stderr/0368
@@ -2,54 +2,12 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
discarded duplicate host ten-1.test.ex (MX=8)
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
fully qualified name = mxt9.test.ex
host_find_bydns yield = HOST_FOUND (3); returned hosts:
ten-1.test.ex V4NET.0.0.1 MX=5
ten-2.test.ex V4NET.0.0.2 MX=6
ten-3.test.ex V4NET.0.0.3 MX=7
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
duplicate IP address V4NET.0.0.5 (MX=5) removed
duplicate IP address V4NET.0.0.6 (MX=6) removed
fully qualified name = mxt14.test.ex
@@ -58,23 +16,14 @@ host_find_bydns yield = HOST_FOUND (3); returned hosts:
ten-5-6.test.ex V4NET.0.0.6 MX=4
finding IP address for ten-1.test.ex
doing DNS lookup
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
finding IP address for ten-1.test.ex
doing DNS lookup
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
finding IP address for ten-2.test.ex
doing DNS lookup
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
fully qualified name = ten-2.test.ex
ten-2.test.ex V4NET.0.0.2 mx=-1 sort=xx
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0370 b/test/stderr/0370
index fb5b1d4..73504d2 100644
--- a/test/stderr/0370
+++ b/test/stderr/0370
@@ -9,7 +9,6 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
@@ -21,18 +20,15 @@ dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>

 --------> |TESTSUITE/bin/iefbr14 <--------
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
 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
-postfork: 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
-postfork: pipe-tpt-output
 delivery-local forked for pipe-tpt-output: npppp
 Writing message to pipe
 writing data block fd=dddd size=sss timeout=3600
diff --git a/test/stderr/0374 b/test/stderr/0374
index d1d1b99..87c60cf 100644
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -341,95 +340,78 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
-postfork: 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
-postfork: 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
-postfork: 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
-postfork: 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
-postfork: 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
-postfork: 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
-postfork: 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
-postfork: delivery-local
-delivery-local forking for pipe-tpt-cmd
-postfork: pipe-tpt-cmd
 local-accept-delivery forked for delivery-local: npppp
+delivery-local forking for pipe-tpt-cmd
 delivery-local forked for pipe-tpt-cmd: npppp
 delivery-local forking for pipe-tpt-output
-postfork: 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
-postfork: delivery-local
-delivery-local forking for pipe-tpt-cmd
-postfork: pipe-tpt-cmd
 local-accept-delivery forked for delivery-local: npppp
+delivery-local forking for pipe-tpt-cmd
 delivery-local forked for pipe-tpt-cmd: npppp
 delivery-local forking for pipe-tpt-output
-postfork: 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
-postfork: transport
+local-accept-delivery forked for transport: npppp
 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
-postfork: transport
-locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forked for transport: npppp
+locking TESTSUITE/spool/db/retry.lockfile
 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
-postfork: transport
+local-accept-delivery forked for transport: npppp
 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
-postfork: bounce-message
 local-accept-delivery forked for bounce-message: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -438,7 +420,6 @@ admin user
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 bounce-message forking for local-accept-delivery
-postfork: local-accept-delivery
 bounce-message forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -490,7 +471,6 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => CALLER <CALLER@???> R=real T=real
diff --git a/test/stderr/0375 b/test/stderr/0375
index 405a38a..fb56cbc 100644
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -761,80 +760,66 @@ After routing:
     g1@???
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
-postfork: 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
-postfork: 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
-postfork: 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
-postfork: 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
-postfork: 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
-postfork: 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
-postfork: 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
-postfork: 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
-postfork: 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
-postfork: 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
-postfork: 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
-postfork: delivery-local
-delivery-local forking for pipe-tpt-cmd
-postfork: pipe-tpt-cmd
 local-accept-delivery forked for delivery-local: npppp
+delivery-local forking for pipe-tpt-cmd
 delivery-local forked for pipe-tpt-cmd: npppp
 delivery-local forking for pipe-tpt-output
-postfork: pipe-tpt-output
 delivery-local forked for pipe-tpt-output: npppp
 transport error EPIPE ignored
 LOG: MAIN
@@ -842,69 +827,59 @@ LOG: MAIN
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
-delivery-local forking for pipe-tpt-cmd
-postfork: pipe-tpt-cmd
 local-accept-delivery forked for delivery-local: npppp
+delivery-local forking for pipe-tpt-cmd
 delivery-local forked for pipe-tpt-cmd: npppp
 delivery-local forking for pipe-tpt-output
-postfork: 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
-postfork: transport
+local-accept-delivery forked for transport: npppp
 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
-postfork: transport
-locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forked for transport: npppp
+locking TESTSUITE/spool/db/retry.lockfile
 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
-postfork: transport
+local-accept-delivery forked for transport: npppp
 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
-postfork: transport
+local-accept-delivery forked for transport: npppp
 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
-postfork: transport
+local-accept-delivery forked for transport: npppp
 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
-postfork: transport
-locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forked for transport: npppp
+locking TESTSUITE/spool/db/retry.lockfile
 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
-postfork: transport
+local-accept-delivery forked for transport: npppp
 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
@@ -913,7 +888,6 @@ LOG: MAIN
   f3@??? <f3@???>: error ignored
 log writing disabled
 local-accept-delivery forking for bounce-message
-postfork: bounce-message
 local-accept-delivery forked for bounce-message: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -922,7 +896,6 @@ admin user
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 bounce-message forking for local-accept-delivery
-postfork: local-accept-delivery
 bounce-message forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -990,7 +963,6 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => CALLER <CALLER@???> P=<> R=real T=real
@@ -1012,7 +984,6 @@ admin user
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -1100,13 +1071,11 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
-postfork: 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
-postfork: delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => h1 <h1@???> P=<CALLER@???> R=ut8 T=ut1
diff --git a/test/stderr/0377 b/test/stderr/0377
index e6f31d3..593542c 100644
--- a/test/stderr/0377
+++ b/test/stderr/0377
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -303,19 +302,16 @@ After routing:
     defer_cccc@???
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
-postfork: 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
-postfork: 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
-postfork: delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => cccc <cccc@???> R=cccc_accept T=t1
@@ -329,7 +325,7 @@ dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
 locking TESTSUITE/spool/db/retry.lockfile

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

Considering: aaaa@???
@@ -566,7 +562,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 >>>>>>>>>>>>>>>>

@@ -577,7 +572,7 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

Considering: aaaa@???
@@ -814,7 +809,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 26f87e9..332b81b 100644
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -5,7 +5,6 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -45,12 +44,11 @@ pipe "/bin/sh -c exit"
mail subject autoreply
text "This is an autoreply"' (tainted)
local-accept-delivery forking for router-interpret
-postfork: router-interpret
+local-accept-delivery forked for router-interpret: npppp
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@???
@@ -122,10 +120,8 @@ After routing:
     defer_aaaa@???
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
-delivery-local forking for autoreply
-postfork: autoreply
 local-accept-delivery forked for delivery-local: npppp
+delivery-local forking for autoreply
 delivery-local forked for autoreply: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -133,7 +129,6 @@ admin user
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
 autoreply forking for local-accept-delivery
-postfork: local-accept-delivery
 autoreply forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -174,20 +169,16 @@ LOG: MAIN
   => >CALLER@??? <aaaa@???> R=aaaa T=t3
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
-delivery-local forking for pipe-tpt-cmd
-postfork: pipe-tpt-cmd
 local-accept-delivery forked for delivery-local: npppp
+delivery-local forking for pipe-tpt-cmd
 delivery-local forked for pipe-tpt-cmd: npppp
 delivery-local forking for pipe-tpt-output
-postfork: 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
-postfork: delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => TESTSUITE/test-mail/file <aaaa@???> R=aaaa T=t1
@@ -201,7 +192,7 @@ dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
 locking TESTSUITE/spool/db/retry.lockfile

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

Considering: aaaa@???
@@ -262,13 +253,11 @@ pipe "/bin/sh -c exit"
mail subject autoreply
text "This is an autoreply"' (tainted)
qrun-delivery forking for router-interpret
-postfork: router-interpret
+qrun-delivery forked for router-interpret: npppp
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 bfcfa32..09087ad 100644
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -130,13 +129,11 @@ After routing:
     defer@???
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
-postfork: 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
-postfork: delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => cccc <aaaa@???> R=bc T=t1
@@ -150,7 +147,7 @@ dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
 locking TESTSUITE/spool/db/retry.lockfile

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

 Considering: defer@???
@@ -180,7 +177,6 @@ After routing:
     defer@???
 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/0380 b/test/stderr/0380
index 2e84ee4..9e43cbb 100644
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -83,7 +82,6 @@ After routing:
     aaaa@???
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => bbbb <bbbb@???> R=r3 T=t1
diff --git a/test/stderr/0381 b/test/stderr/0381
index 2dcb7a7..648d9f6 100644
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -38,31 +38,16 @@ check hosts = *.gov.uk.test.ex
 sender host name required, to match against *.gov.uk.test.ex
 looking up host name for V4NET.99.99.97
 DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) succeeded
 IP address lookup yielded "x.gov.uk.test.ex"
   alias "x.co.uk.test.ex"
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of x.gov.uk.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of x.gov.uk.test.ex (A) succeeded
 x.gov.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 
 checking addresses for x.gov.uk.test.ex
 Forward DNS security status: unverified
   V4NET.99.99.97 OK
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of x.co.uk.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of x.co.uk.test.ex (A) succeeded
 x.co.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 
 checking addresses for x.co.uk.test.ex
diff --git a/test/stderr/0382 b/test/stderr/0382
index 44293f1..3640b8f 100644
--- a/test/stderr/0382
+++ b/test/stderr/0382
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -19,7 +18,6 @@ system filter returned 1
 LOG: MAIN
   ** userx@??? R=r1: forced fail
 local-accept-delivery forking for bounce-message
-postfork: bounce-message
 local-accept-delivery forked for bounce-message: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -28,7 +26,6 @@ admin user
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 bounce-message forking for local-accept-delivery
-postfork: local-accept-delivery
 bounce-message forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -56,13 +53,12 @@ dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
 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 c2061ff..cc84e88 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -195,16 +195,10 @@ check acl = TESTSUITE/aux-fixed/0386.acl2
dnslists check: rbl.test.ex
new DNS lookup for 13.12.11.V4NET.rbl.test.ex
DNS lookup of 13.12.11.V4NET.rbl.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of 13.12.11.V4NET.rbl.test.ex (A) succeeded
dnslists: wrote cache entry, ttl=3
DNS lookup for 13.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) succeeded
=> that means V4NET.11.12.13 is listed at rbl.test.ex
warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
@@ -250,9 +244,8 @@ LOG: MAIN
SMTP>> 250 OK id=10HmaX-0005vi-00

search_tidyup called
fresh-exec forking for local-accept-delivery
-postfork: 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
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -327,7 +320,7 @@ search_tidyup called
no retry data available
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
changed uid/gid: local delivery to 2 <2@b> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -350,7 +343,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)
@@ -449,9 +441,8 @@ LOG: MAIN
SMTP>> 250 OK id=10HmaY-0005vi-00

search_tidyup called
fresh-exec forking for local-accept-delivery
-postfork: 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
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -525,7 +516,7 @@ search_tidyup called
no retry data available
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
changed uid/gid: local delivery to 2 <2@b> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -548,7 +539,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 64646c6..512f340 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -71,7 +71,7 @@ After routing:
search_tidyup called
search_tidyup called
fresh-exec forking for transport
-postfork: transport
+fresh-exec forked for transport: npppp
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
@@ -103,7 +103,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 "*")
@@ -173,9 +172,8 @@ LOG: MAIN
closed hints database and lockfile
end of retry processing
fresh-exec forking for bounce-message
-postfork: 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
+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
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -231,9 +229,8 @@ LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
search_tidyup called
bounce-message forking for local-accept-delivery
-postfork: 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
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
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 d3e3862..d9c77b1 100644
--- a/test/stderr/0393
+++ b/test/stderr/0393
@@ -5,7 +5,6 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -15,7 +14,7 @@ dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>

--------> userx@??? <--------
local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
direct command:
argv[0] = '/bin/cat'
direct command after expansion:
@@ -34,16 +33,13 @@ 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
-postfork: 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
-postfork: tpt-filter-writer
+delivery-local forked for tpt-filter-writer: npppp
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
@@ -65,7 +61,6 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -75,7 +70,7 @@ dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>

--------> userx@??? <--------
local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
direct command:
direct command after expansion:
appendfile transport entered
@@ -95,7 +90,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
@@ -109,7 +103,6 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -119,7 +112,7 @@ dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>

 --------> userx@??? <--------
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
 direct command:
   argv[0] = '${if={1}{1}{}{}}'
 direct command after expansion:
@@ -141,7 +134,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 4a70c73..ccc2b27 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -175,9 +175,8 @@ LOG: MAIN
 created log directory TESTSUITE/spool/log
 search_tidyup called
 fresh-exec forking for local-accept-delivery
-postfork: 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
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
@@ -460,7 +459,7 @@ no retry data available
             ╰──(tainted)
 search_tidyup called
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
 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=/
@@ -505,7 +504,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)
@@ -522,7 +520,7 @@ LOG: MAIN
 no retry data available
 search_tidyup called
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
 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=/
@@ -567,7 +565,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)
@@ -584,7 +581,7 @@ LOG: MAIN
 no retry data available
 search_tidyup called
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
 changed uid/gid: local delivery to CALLER <CALLER@???> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=/non-exist/CALLER current=/
@@ -597,7 +594,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)
@@ -617,7 +613,7 @@ no retry data available
             ╰──(tainted)
 search_tidyup called
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
 changed uid/gid: local delivery to usery <usery@???> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=/non-exist/usery current=/
@@ -630,7 +626,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)
@@ -650,7 +645,7 @@ no retry data available
             ╰──(tainted)
 search_tidyup called
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
 changed uid/gid: local delivery to userz <userz@???> transport=t2
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=/userz current=/
@@ -663,7 +658,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 126c38f..ec8ebde 100644
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -45,9 +45,8 @@ LOG: MAIN
 created log directory TESTSUITE/spool/log
 search_tidyup called
 fresh-exec forking for local-accept-delivery
-postfork: 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
+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
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
@@ -164,7 +163,7 @@ search_tidyup called
 no retry data available
 search_tidyup called
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
 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
@@ -183,7 +182,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 8185fcb..e417f77 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -144,9 +144,8 @@ LOG: MAIN
 created log directory TESTSUITE/spool/log
 search_tidyup called
 fresh-exec forking for local-accept-delivery
-postfork: 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
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
@@ -202,7 +201,7 @@ mail text rhubarb
 seen finish'
 search_tidyup called
 local-accept-delivery forking for router-interpret
-postfork: router-interpret
+local-accept-delivery forked for router-interpret: npppp
 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)
@@ -211,7 +210,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@???, ...
@@ -249,7 +247,7 @@ search_tidyup called
no retry data available
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
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=/
@@ -257,10 +255,8 @@ set_process_info: pppp **** string overflowed buffer ****
t1 transport entered
taking data from address
delivery-local forking for autoreply
-postfork: 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
+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
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -1532,9 +1528,8 @@ LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
search_tidyup called
autoreply forking for local-accept-delivery
-postfork: 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
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -17997,7 +17992,7 @@ sender@??? is a duplicate address: discarded
no retry data available
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
changed uid/gid: local delivery to sender <sender@???> transport=t2
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -18022,7 +18017,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 e83fad6..2891a2c 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -45,9 +45,8 @@ LOG: MAIN
created log directory TESTSUITE/spool/log
search_tidyup called
fresh-exec forking for local-accept-delivery
-postfork: 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
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -145,7 +144,7 @@ search_tidyup called
no retry data available
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -168,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/0419 b/test/stderr/0419
index 0af69e9..1a1564d 100644
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -24,25 +24,10 @@ dnslookup router called for k@???
domain = mxt13.test.ex
mxt13.test.ex in "*"? yes (matched "*")
DNS lookup of mxt13.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of mxt13.test.ex (MX) succeeded
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of other1.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of other1.test.ex (A) succeeded
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of other2.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of other2.test.ex (A) succeeded
other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!other1.test.ex")
other1.test.ex in hosts_treat_as_local? no (end of list)
diff --git a/test/stderr/0426 b/test/stderr/0426
index 8353cfb..b776c92 100644
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -5,7 +5,6 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -29,16 +28,7 @@ local_part=x domain=uppercase.test.ex
calling r1 router
r1 router called for x@???
domain = uppercase.test.ex
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
uppercase.test.ex (MX resp) DNSSEC
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
local host found for non-MX address
fully qualified name = UpperCase.test.ex
uppercase.test.ex 127.0.0.1 mx=-1 sort=xx
@@ -60,14 +50,12 @@ After routing:
Failed addresses:
Deferred addresses:
local-accept-delivery forking for transport
-postfork: transport
+local-accept-delivery forked for transport: npppp
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
-postfork: bounce-message
local-accept-delivery forked for bounce-message: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -76,7 +64,6 @@ admin user
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
bounce-message forking for local-accept-delivery
-postfork: local-accept-delivery
bounce-message forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
diff --git a/test/stderr/0433 b/test/stderr/0433
index 8f4b59a..ad13502 100644
--- a/test/stderr/0433
+++ b/test/stderr/0433
@@ -19,9 +19,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: 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
+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
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
@@ -44,9 +43,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: 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
+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
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
@@ -70,9 +68,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: 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
+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
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
@@ -96,9 +93,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: 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
+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
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
@@ -123,9 +119,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: 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
+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
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
@@ -150,8 +145,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: 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
+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
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0437 b/test/stderr/0437
index ee623d5..9bb49b0 100644
--- a/test/stderr/0437
+++ b/test/stderr/0437
@@ -17,7 +17,7 @@ LOG: queue_run MAIN
   Start queue run: pid=pppp
 search_tidyup called
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
    key="transport" partial=-1 affix=NULL starflags=0
@@ -32,7 +32,7 @@ postfork: qrun-delivery
 search_tidyup called
 search_tidyup called
 qrun-delivery forking for delivery-local
-postfork: delivery-local
+qrun-delivery forked for delivery-local: npppp
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
    key="file" partial=-1 affix=NULL starflags=0
@@ -45,8 +45,6 @@ postfork: 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
@@ -55,7 +53,7 @@ search_tidyup called

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

 search_tidyup called
 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
    key="transport" partial=-1 affix=NULL starflags=0
@@ -70,7 +68,7 @@ postfork: qrun-delivery
 search_tidyup called
 search_tidyup called
 qrun-delivery forking for delivery-local
-postfork: delivery-local
+qrun-delivery forked for delivery-local: npppp
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
    key="file" partial=-1 affix=NULL starflags=0
@@ -83,8 +81,6 @@ postfork: 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 eb5cef8..0dc65a1 100644
--- a/test/stderr/0438
+++ b/test/stderr/0438
@@ -21,9 +21,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
 daemon forking for daemon-del-pidfile
-pppp postfork: 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
+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
 search_tidyup called

>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
@@ -47,9 +46,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: 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
+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
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
@@ -73,8 +71,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: 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
+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
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0450 b/test/stderr/0450
index 31d6662..d310614 100644
--- a/test/stderr/0450
+++ b/test/stderr/0450
@@ -5,7 +5,6 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -15,7 +14,7 @@ dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>

--------> userx@??? <--------
local-accept-delivery forking for transport
-postfork: transport
+local-accept-delivery forked for transport: npppp
t1 transport entered
userx@???
using the transport's hosts: 127.0.0.1
@@ -27,7 +26,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
@@ -43,11 +41,11 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>

--------> userx@??? <--------
qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
t1 transport entered
userx@???
using the transport's hosts: 127.0.0.1
@@ -61,8 +59,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/0463 b/test/stderr/0463
index 10fd4da..d85af39 100644
--- a/test/stderr/0463
+++ b/test/stderr/0463
@@ -17,9 +17,6 @@ routing x@ten-1
local_part=x domain=ten-1
checking domains
DNS lookup of ten-1 (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1 (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
@@ -31,21 +28,12 @@ all router called for x@ten-1
domain = ten-1
ten-1 in "*"? yes (matched "*")
DNS lookup of ten-1 (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1 (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for ten-1-MX-xxxx, ttl 3000
ten-1 (MX resp) DNSSEC
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1 (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1 (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
@@ -60,9 +48,6 @@ routing x@???
local_part=x domain=ten-1.test.ex
checking domains
DNS lookup of ten-1.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
@@ -74,21 +59,12 @@ all router called for x@???
domain = ten-1.test.ex
ten-1.test.ex in "*"? yes (matched "*")
DNS lookup of ten-1.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
ten-1.test.ex (MX resp) DNSSEC
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
diff --git a/test/stderr/0469 b/test/stderr/0469
index 0a07f4c..3401ded 100644
--- a/test/stderr/0469
+++ b/test/stderr/0469
@@ -20,14 +20,8 @@ r1 router called for x@???
domain = mxt1c.test.ex
mxt1c.test.ex in "*"? yes (matched "*")
DNS lookup of mxt1c.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of mxt1c.test.ex (MX) succeeded
DNS lookup of dontqualify (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of dontqualify (A) gave NO_DATA
returning DNS_NODATA
DNS: no SOA record found for neg-TTL
diff --git a/test/stderr/0476 b/test/stderr/0476
index d88b3a8..f89294e 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -7,12 +7,13 @@ 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
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
+set_process_info: pppp running queue: waiting for 10HmaX-0005vi-00 (pppp)
set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid ppppp)
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>

--------> userx@??? <--------
qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
set_process_info: pppp delivering 10HmaX-0005vi-00 using t1
t1 transport entered
userx@???
@@ -54,16 +55,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
-postfork: 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
@@ -75,7 +72,6 @@ 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
-postfork: local-accept-delivery
bounce-message forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -87,7 +83,7 @@ set_process_info: pppp delivering 10HmaZ-0005vi-00
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>

--------> CALLER@??? <--------
local-accept-delivery forking for transport
-postfork: transport
+local-accept-delivery forked for transport: npppp
set_process_info: pppp delivering 10HmaZ-0005vi-00 using t1
t1 transport entered
CALLER@???
@@ -102,7 +98,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
@@ -122,12 +117,13 @@ 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
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
+set_process_info: pppp running queue: waiting for 10HmaY-0005vi-00 (pppp)
set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid ppppp)
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>

--------> usery@??? <--------
qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
set_process_info: pppp delivering 10HmaY-0005vi-00 using t1
t1 transport entered
usery@???
@@ -141,9 +137,6 @@ 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 3149a11..436b343 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -72,9 +72,8 @@ created log directory TESTSUITE/spool/log
SMTP>> 250 OK id=10HmaX-0005vi-00

search_tidyup called
fresh-exec forking for local-accept-delivery
-postfork: 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
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -147,7 +146,7 @@ search_tidyup called
no retry data available
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -172,7 +171,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/0499 b/test/stderr/0499
index 653a476..9a48f3a 100644
--- a/test/stderr/0499
+++ b/test/stderr/0499
@@ -17,14 +17,8 @@ routing ph@???
local_part=ph domain=mxt1.test.ex
checking domains
DNS lookup of mxt1.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of mxt1.test.ex (MX) succeeded
DNS lookup of eximtesthost.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of eximtesthost.test.ex (A) succeeded
local host has lowest MX
host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
@@ -33,14 +27,8 @@ mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
mxt1.test.ex in "+anymx"? yes (matched "+anymx")
checking "condition" "${if match_domain{$domain}{+anymx}{yes}}"...
DNS lookup of mxt1.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of mxt1.test.ex (MX) succeeded
DNS lookup of eximtesthost.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of eximtesthost.test.ex (A) succeeded
local host has lowest MX
host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
diff --git a/test/stderr/0512 b/test/stderr/0512
index 240fd35..4161f97 100644
--- a/test/stderr/0512
+++ b/test/stderr/0512
@@ -5,11 +5,11 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>

--------> userx@??? <--------
qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
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
@@ -24,8 +24,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
@@ -68,7 +66,6 @@ LOG: MAIN
LOG: MAIN
** userx@???: retry timeout exceeded
qrun-delivery forking for bounce-message
-postfork: 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
@@ -79,7 +76,6 @@ admin user
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
bounce-message forking for local-accept-delivery
-postfork: local-accept-delivery
bounce-message forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -105,11 +101,11 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>

--------> userx@??? <--------
qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
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
@@ -124,8 +120,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
@@ -148,7 +142,6 @@ LOG: MAIN
LOG: MAIN
** userx@???: retry timeout exceeded
qrun-delivery forking for bounce-message
-postfork: 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
@@ -159,7 +152,6 @@ admin user
LOG: MAIN
<= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
bounce-message forking for local-accept-delivery
-postfork: local-accept-delivery
bounce-message forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
diff --git a/test/stderr/0529 b/test/stderr/0529
index b8edd82..24b48ba 100644
--- a/test/stderr/0529
+++ b/test/stderr/0529
@@ -5,7 +5,6 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -32,7 +31,6 @@ After routing:
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
local-accept-delivery forking for delivery-local
-postfork: 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
@@ -60,7 +58,7 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

Considering: x@???
@@ -93,7 +91,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 43cf03c..72a6d44 100644
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -5,7 +5,7 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

Considering: userx@domain1
@@ -34,15 +34,7 @@ After routing:
Failed addresses:
Deferred addresses:
qrun-delivery forking for transport
-postfork: transport
-transport forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for qrun-delivery: npppp
qrun-delivery forked for transport: npppp
-transport forked for fakens-search: npppp
-transport forking for fakens-search
-postfork: fakens-search
-transport forked for fakens-search: npppp
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-smtp.lockfile
LOG: MAIN
@@ -51,7 +43,7 @@ LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 Considering: usery@domain1
@@ -66,7 +58,6 @@ After routing:
   Deferred addresses:
     usery@domain1

>>>>>>>>>>>>>>>> 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/0544 b/test/stderr/0544
index fa7e2d7..66da14d 100644
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -120,7 +120,6 @@ LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
@@ -129,12 +128,11 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 local-accept-delivery forking for transport
-postfork: transport
+local-accept-delivery forked for transport: npppp
  ╭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/0545 b/test/stderr/0545
index 33d2894..964648f 100644
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -20,30 +20,18 @@ dns router called for userx@alias-eximtesthost
   domain = alias-eximtesthost
 alias-eximtesthost in "*"? yes (matched "*")
 DNS lookup of alias-eximtesthost (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of alias-eximtesthost (MX) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 faking res_search(MX) response length as 65535
  writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000
 alias-eximtesthost (MX resp) DNSSEC
 DNS lookup of alias-eximtesthost (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of alias-eximtesthost (A) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of eximtesthost.test.ex (A) succeeded
 local host found for non-MX address
 fully qualified name = alias-eximtesthost.test.ex
@@ -62,22 +50,13 @@ dns router called for userx@???
   domain = alias-eximtesthost.test.ex
 alias-eximtesthost.test.ex in "*"? yes (matched "*")
 DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex-MX: using cached value DNS_NODATA
 DNS lookup of alias-eximtesthost.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of alias-eximtesthost.test.ex (A) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of eximtesthost.test.ex (A) succeeded
 local host found for non-MX address
 fully qualified name = alias-eximtesthost.test.ex
@@ -116,30 +95,18 @@ dns router called for userx@???
   domain = alias-eximtesthost.test.ex
 alias-eximtesthost.test.ex in "*"? yes (matched "*")
 DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 faking res_search(MX) response length as 65535
  writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000
 alias-eximtesthost.test.ex (MX resp) DNSSEC
 DNS lookup of alias-eximtesthost.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of alias-eximtesthost.test.ex (A) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of eximtesthost.test.ex (A) succeeded
 local host found for non-MX address
 fully qualified name = alias-eximtesthost.test.ex
diff --git a/test/stderr/0554 b/test/stderr/0554
index 7b8afc0..8e91438 100644
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -16,12 +16,11 @@ After routing:
   Failed addresses:
   Deferred addresses:
 fresh-exec forking for transport
-postfork: transport
+fresh-exec forked for transport: npppp
 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
@@ -59,7 +58,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
 fresh-exec forking for transport
-postfork: transport
+fresh-exec forked for transport: npppp
 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
@@ -67,7 +66,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 2cef9ec..a6027e8 100644
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -18,16 +18,15 @@ 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 postfork: daemon-accept
+ppppp daemon forked for daemon-accept: npppp
+ppppp 1 SMTP accept process running
+ppppp Listening...
 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"
 ppppp end of ACL "delay4_accept": ACCEPT
 ppppp LOG: smtp_connection MAIN
@@ -41,7 +40,9 @@ 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 postfork: daemon-accept
+ppppp daemon forked for daemon-accept: npppp
+ppppp 1 SMTP accept process running
+ppppp Listening...
 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"
@@ -54,9 +55,10 @@ 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 child ppppp ended: status=0x100
+ppppp   normal exit, 1
+ppppp 0 SMTP accept processes now running
+ppppp Listening...
 ppppp daemon forking for daemon-del-pidfile
-ppppp postfork: 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/1006 b/test/stderr/1006
index 0cb661d..77a5a84 100644
--- a/test/stderr/1006
+++ b/test/stderr/1006
@@ -3,44 +3,20 @@ configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 DNS lookup of mx46.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of mx46.test.ex (MX) succeeded
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of 46.test.ex (AAAA) succeeded
 DNS lookup of 46.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of 46.test.ex (A) succeeded
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of 46.test.ex (AAAA) succeeded
 DNS lookup of 46.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of 46.test.ex (A) succeeded
 DNS lookup of v6.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of v6.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 faking res_search(MX) response length as 65535
  writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of v6.test.ex (AAAA) succeeded
 DNS lookup of v6.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of v6.test.ex (A) gave NO_DATA
 returning DNS_NODATA
 faking res_search(A) response length as 65535
@@ -51,32 +27,17 @@ configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 DNS lookup of mx46.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of mx46.test.ex (MX) succeeded
 DNS lookup of 46.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of 46.test.ex (A) succeeded
 DNS lookup of 46.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of 46.test.ex (A) succeeded
 DNS lookup of v6.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of v6.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 faking res_search(MX) response length as 65535
  writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000
 DNS lookup of v6.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of v6.test.ex (A) gave NO_DATA
 returning DNS_NODATA
 faking res_search(A) response length as 65535
diff --git a/test/stderr/1007 b/test/stderr/1007
index e0a951c..5bd20c2 100644
--- a/test/stderr/1007
+++ b/test/stderr/1007
@@ -20,9 +20,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
 daemon forking for daemon-del-pidfile
-pppp postfork: 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
+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
 search_tidyup called

>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
@@ -47,9 +46,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: 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
+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
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
@@ -75,9 +73,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: 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 ; 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
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 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
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
@@ -103,9 +100,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: 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 ; ::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
+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 ; ::0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
@@ -128,9 +124,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [ip6:i
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: daemon-del-pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
daemon forked for daemon-del-pidfile: npppp
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
@@ -156,9 +151,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: 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 ; 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
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 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
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
@@ -185,9 +179,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: 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 ; 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
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 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
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
@@ -213,8 +206,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
daemon forking for daemon-del-pidfile
-pppp postfork: 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
+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
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/2013 b/test/stderr/2013
index c257187..070012d 100644
--- a/test/stderr/2013
+++ b/test/stderr/2013
@@ -5,36 +5,28 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
 qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
 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
@@ -60,16 +52,12 @@ cmd buf flush ddd bytes
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbA-0005vi-00
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
 transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forking for continued-transport
 continued-transport-interproc forked for continued-transport: npppp
 transport forking for tls-proxy-interproc
-postfork: tls-proxy-interproc
-tls-proxy-interproc forking for tls-proxy
-postfork: tls-proxy
 transport forked for tls-proxy-interproc: npppp
+tls-proxy-interproc forking for tls-proxy
 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"
@@ -82,7 +70,7 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 continued-transport forking for transport
-postfork: transport
+continued-transport forked for transport: npppp
   SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
   SMTP>> RCPT TO:<userz@???>
   SMTP>> DATA
@@ -92,11 +80,8 @@ cmd buf flush ddd bytes
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbB-0005vi-00
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
-continued-transport forked for transport: npppp
 transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forking for continued-transport
 continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
@@ -110,7 +95,7 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 continued-transport forking for transport
-postfork: transport
+continued-transport forked for transport: npppp
   SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
   SMTP>> RCPT TO:<usery@???>
   SMTP>> DATA
@@ -122,7 +107,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"
@@ -139,36 +123,28 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
 qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
 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
@@ -194,16 +170,12 @@ cmd buf flush ddd bytes
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbG-0005vi-00
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
 transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forking for continued-transport
 continued-transport-interproc forked for continued-transport: npppp
 transport forking for tls-proxy-interproc
-postfork: tls-proxy-interproc
-tls-proxy-interproc forking for tls-proxy
-postfork: tls-proxy
 transport forked for tls-proxy-interproc: npppp
+tls-proxy-interproc forking for tls-proxy
 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"
@@ -216,7 +188,7 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 continued-transport forking for transport
-postfork: transport
+continued-transport forked for transport: npppp
   SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
   SMTP>> RCPT TO:<userc@???>
   SMTP>> DATA
@@ -226,11 +198,8 @@ cmd buf flush ddd bytes
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbH-0005vi-00
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
-continued-transport forked for transport: npppp
 transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forking for continued-transport
 continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
@@ -244,7 +213,7 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 continued-transport forking for transport
-postfork: transport
+continued-transport forked for transport: npppp
   SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
   SMTP>> RCPT TO:<userb@???>
   SMTP>> DATA
@@ -256,7 +225,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"
@@ -273,36 +241,28 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
-qrun-delivery forking for transport
-postfork: transport
fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forking for transport
qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
+fresh-exec forked for qrun-delivery: npppp
 qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
 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
@@ -336,10 +296,8 @@ cmd buf flush ddd bytes
          250-STARTTLS
          250 HELP
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
 transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forking for continued-transport
 continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
@@ -353,10 +311,9 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 continued-transport forking for transport
-postfork: transport
+continued-transport forked for transport: npppp
   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
@@ -382,10 +339,8 @@ cmd buf flush ddd bytes
          250-STARTTLS
          250 HELP
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
 transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forking for continued-transport
 continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
@@ -399,10 +354,9 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 continued-transport forking for transport
-postfork: transport
+continued-transport forked for transport: npppp
   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 d1bcefb..2ea5ca5 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -36,16 +36,13 @@ sync_responses expect rcpt
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local-smtp S=sss
 fresh-exec forking for local-accept-delivery
-postfork: 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
-postfork: tls-proxy-interproc
-tls-proxy-interproc forking for tls-proxy
-postfork: tls-proxy
local-accept-delivery forked for tls-proxy-interproc: npppp
+tls-proxy-interproc forking for tls-proxy
tls-proxy-interproc forked for tls-proxy: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -55,7 +52,7 @@ dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>

--------> userb@??? <--------
local-accept-delivery forking for transport
-postfork: transport
+local-accept-delivery forked for transport: npppp
t1 transport entered
userb@???
hostlist:
@@ -78,7 +75,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/2113 b/test/stderr/2113
index 00f475d..f8b52f0 100644
--- a/test/stderr/2113
+++ b/test/stderr/2113
@@ -5,30 +5,22 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
qrun-delivery forking for transport
-postfork: 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
-postfork: qrun-delivery
qrun-delivery forking for transport
-postfork: 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
-postfork: qrun-delivery
qrun-delivery forking for transport
-postfork: 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
-postfork: qrun-delivery
qrun-delivery forking for transport
-postfork: 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
@@ -60,15 +52,11 @@ cmd buf flush ddd bytes
SMTP<< 354 Enter message, ending with "." on a line by itself
SMTP<< 250 OK id=10HmbA-0005vi-00
transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
continued-transport-interproc forking for continued-transport
-postfork: continued-transport
transport forked for continued-transport-interproc: npppp
continued-transport-interproc forked for continued-transport: npppp
transport forking for tls-proxy-interproc
-postfork: tls-proxy-interproc
tls-proxy-interproc forking for tls-proxy
-postfork: tls-proxy
transport forked for tls-proxy-interproc: npppp
tls-proxy-interproc forked for tls-proxy: npppp
LOG: MAIN
@@ -82,7 +70,6 @@ trusted user
admin user
dropping to exim gid; retaining priv uid
continued-transport forking for transport
-postfork: transport
SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
SMTP>> RCPT TO:<userz@???>
SMTP>> DATA
@@ -92,9 +79,7 @@ cmd buf flush ddd bytes
SMTP<< 354 Enter message, ending with "." on a line by itself
SMTP<< 250 OK id=10HmbB-0005vi-00
transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
continued-transport-interproc forking for continued-transport
-postfork: continued-transport
continued-transport forked for transport: npppp
transport forked for continued-transport-interproc: npppp
continued-transport-interproc forked for continued-transport: npppp
@@ -110,7 +95,6 @@ trusted user
admin user
dropping to exim gid; retaining priv uid
continued-transport forking for transport
-postfork: transport
SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
SMTP>> RCPT TO:<usery@???>
SMTP>> DATA
@@ -139,30 +123,22 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
qrun-delivery forking for transport
-postfork: 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
-postfork: qrun-delivery
qrun-delivery forking for transport
-postfork: 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
-postfork: qrun-delivery
qrun-delivery forking for transport
-postfork: 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
-postfork: qrun-delivery
qrun-delivery forking for transport
-postfork: 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
@@ -194,15 +170,11 @@ cmd buf flush ddd bytes
SMTP<< 354 Enter message, ending with "." on a line by itself
SMTP<< 250 OK id=10HmbG-0005vi-00
transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
continued-transport-interproc forking for continued-transport
-postfork: continued-transport
transport forked for continued-transport-interproc: npppp
continued-transport-interproc forked for continued-transport: npppp
transport forking for tls-proxy-interproc
-postfork: tls-proxy-interproc
tls-proxy-interproc forking for tls-proxy
-postfork: tls-proxy
transport forked for tls-proxy-interproc: npppp
tls-proxy-interproc forked for tls-proxy: npppp
LOG: MAIN
@@ -216,7 +188,6 @@ trusted user
admin user
dropping to exim gid; retaining priv uid
continued-transport forking for transport
-postfork: transport
SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
SMTP>> RCPT TO:<userc@???>
SMTP>> DATA
@@ -226,9 +197,7 @@ cmd buf flush ddd bytes
SMTP<< 354 Enter message, ending with "." on a line by itself
SMTP<< 250 OK id=10HmbH-0005vi-00
transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
continued-transport-interproc forking for continued-transport
-postfork: continued-transport
continued-transport forked for transport: npppp
transport forked for continued-transport-interproc: npppp
continued-transport-interproc forked for continued-transport: npppp
@@ -244,7 +213,6 @@ trusted user
admin user
dropping to exim gid; retaining priv uid
continued-transport forking for transport
-postfork: transport
SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
SMTP>> RCPT TO:<userb@???>
SMTP>> DATA
@@ -273,30 +241,22 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
fresh-exec forking for qrun-delivery
-postfork: qrun-delivery
qrun-delivery forking for transport
-postfork: 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
-postfork: qrun-delivery
qrun-delivery forking for transport
-postfork: 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
-postfork: qrun-delivery
qrun-delivery forking for transport
-postfork: 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
-postfork: qrun-delivery
 qrun-delivery forking for transport
-postfork: 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
@@ -336,9 +296,7 @@ cmd buf flush ddd bytes
          250-STARTTLS
          250 HELP
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
 continued-transport-interproc forking for continued-transport
-postfork: continued-transport
 transport forked for continued-transport-interproc: npppp
 continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
@@ -353,7 +311,6 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 continued-transport forking for transport
-postfork: transport
   SMTP>> STARTTLS
 cmd buf flush ddd bytes
 continued-transport forked for transport: npppp
@@ -382,9 +339,7 @@ cmd buf flush ddd bytes
          250-STARTTLS
          250 HELP
 transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
 continued-transport-interproc forking for continued-transport
-postfork: continued-transport
 transport forked for continued-transport-interproc: npppp
 continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
@@ -399,7 +354,6 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 continued-transport forking for transport
-postfork: transport
   SMTP>> STARTTLS
 cmd buf flush ddd bytes
 continued-transport forked for transport: npppp
diff --git a/test/stderr/2135 b/test/stderr/2135
index d1bcefb..b836e5e 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -36,15 +36,12 @@ sync_responses expect rcpt
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local-smtp S=sss
 fresh-exec forking for local-accept-delivery
-postfork: 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
-postfork: tls-proxy-interproc
tls-proxy-interproc forking for tls-proxy
-postfork: tls-proxy
local-accept-delivery forked for tls-proxy-interproc: npppp
tls-proxy-interproc forked for tls-proxy: npppp
Exim version x.yz ....
@@ -55,7 +52,6 @@ dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>

 --------> userb@??? <--------
 local-accept-delivery forking for transport
-postfork: transport
 t1 transport entered
   userb@???
 hostlist:
diff --git a/test/stderr/2200 b/test/stderr/2200
index 667c71b..7ea33c6 100644
--- a/test/stderr/2200
+++ b/test/stderr/2200
@@ -10,9 +10,6 @@ dropping to exim gid; retaining priv uid
    type=dnsdb key="a=localhost.test.ex"
  database lookup required for a=localhost.test.ex
  dnsdb key: localhost.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
  lookup yielded: 127.0.0.1
  search_open: dnsdb "NULL"
    cached open
@@ -38,9 +35,6 @@ search_tidyup called
     type=dnsdb key="a=shorthost.test.ex"
   database lookup required for a=shorthost.test.ex
   dnsdb key: shorthost.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
   lookup yielded: 127.0.0.1
   search_open: dnsdb "NULL"
     cached open
@@ -51,9 +45,6 @@ fresh-exec forked for fakens-search: npppp
     type=dnsdb key="a=shorthost.test.ex"
   cached data found but past valid time;   database lookup required for a=shorthost.test.ex
   dnsdb key: shorthost.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
   lookup yielded: 127.0.0.1
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
diff --git a/test/stderr/2201 b/test/stderr/2201
index 405818c..fd1452a 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -36,9 +36,6 @@ internal_search_find: file="NULL"
 database lookup required for test.ex
 dnsdb key: test.ex
 DNS lookup of test.ex (TXT) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of test.ex (TXT) succeeded
 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
@@ -100,9 +97,6 @@ internal_search_find: file="NULL"
 database lookup required for unknown
 dnsdb key: unknown
 DNS lookup of unknown (TXT) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of unknown (TXT) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
 faking res_search(TXT) response length as 65535
@@ -135,9 +129,6 @@ internal_search_find: file="NULL"
 database lookup required for A=myhost.test.ex
 dnsdb key: myhost.test.ex
 DNS lookup of myhost.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of myhost.test.ex (A) succeeded
 lookup yielded: V4NET.10.10.10
 CALLER@??? in "dnsdb;A=myhost.test.ex"? yes (matched "dnsdb;A=myhost.test.ex")
@@ -168,9 +159,6 @@ internal_search_find: file="NULL"
   type=dnsdb key="a=shorthost.test.ex"
 database lookup required for a=shorthost.test.ex
 dnsdb key: shorthost.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 lookup yielded: 127.0.0.1
 search_open: dnsdb "NULL"
   cached open
@@ -190,9 +178,6 @@ internal_search_find: file="NULL"
   type=dnsdb key="a=shorthost.test.ex"
 cached data found but past valid time; database lookup required for a=shorthost.test.ex
 dnsdb key: shorthost.test.ex
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 lookup yielded: 127.0.0.1
 LOG: MAIN
   <= a@??? U=CALLER P=local S=sss
@@ -218,28 +203,15 @@ 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 postfork: daemon-accept
 ppppp Process ppppp is handling incoming connection from [127.0.0.1]
 ppppp Process ppppp is ready for new message
-ppppp daemon-accept forking for fakens-search
-ppppp postfork: fakens-search
 ppppp daemon forked for daemon-accept: npppp
 ppppp 1 SMTP accept process running
 ppppp Listening...
-ppppp daemon-accept forked for fakens-search: npppp
-ppppp daemon-accept forking for fakens-search
-ppppp postfork: fakens-search
-ppppp daemon-accept forked for fakens-search: npppp
 ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
 ppppp new DNS lookup for 14.12.11.V4NET.rbl.test.ex
-ppppp daemon-accept forking for fakens-search
-ppppp postfork: fakens-search
-ppppp daemon-accept forked for fakens-search: npppp
 ppppp dnslists: wrote cache entry, ttl=2
 ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
-ppppp daemon-accept forking for fakens-search
-ppppp postfork: fakens-search
-ppppp daemon-accept forked for fakens-search: npppp
 ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
 ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
 ppppp dnslists: using result of previous lookup
@@ -247,14 +219,8 @@ ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
 ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
 ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
 ppppp cached data found but past valid time; new DNS lookup for 14.12.11.V4NET.rbl.test.ex
-ppppp daemon-accept forking for fakens-search
-ppppp postfork: fakens-search
-ppppp daemon-accept forked for fakens-search: npppp
 ppppp dnslists: wrote cache entry, ttl=2
 ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
-ppppp daemon-accept forking for fakens-search
-ppppp postfork: fakens-search
-ppppp daemon-accept forked for fakens-search: npppp
 ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
 ppppp LOG: MAIN
 ppppp   <= a@??? H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@???
@@ -267,6 +233,5 @@ ppppp   normal exit, 0
 ppppp 0 SMTP accept processes now running
 ppppp Listening...
 ppppp daemon forking for daemon-del-pidfile
-ppppp postfork: 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/2202 b/test/stderr/2202
index ab32906..f9dd812 100644
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -39,9 +39,6 @@ check hosts = +ignore_unknown : *.$sender_address_domain : $sender_address_domai
  database lookup required for >:defer_never,mxh=cioce.test.again.dns
  dnsdb key: cioce.test.again.dns
 DNS lookup of cioce.test.again.dns (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of cioce.test.again.dns (MX) gave TRY_AGAIN
 cioce.test.again.dns in dns_again_means_nonexist? yes (matched "*")
 cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH
@@ -51,15 +48,9 @@ DNS: no SOA record found for neg-TTL
 sender host name required, to match against *.cioce.test.again.dns
 looking up host name for ip4.ip4.ip4.ip4
 DNS lookup of ip4-reverse.in-addr.arpa (PTR) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of ip4-reverse.in-addr.arpa (PTR) succeeded
 IP address lookup yielded "the.local.host.name"
 DNS lookup of the.local.host.name (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of the.local.host.name (A) succeeded
 local host found for non-MX address
 the.local.host.name ip4.ip4.ip4.ip4 mx=-1 sort=xx 
@@ -70,9 +61,6 @@ sender_fullhost = the.local.host.name [ip4.ip4.ip4.ip4]
 sender_rcvhost = the.local.host.name ([ip4.ip4.ip4.ip4])
 using host_fake_gethostbyname for cioce.test.again.dns (IPv4)
 DNS lookup of cioce.test.again.dns (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of cioce.test.again.dns (A) gave TRY_AGAIN
 cioce.test.again.dns in dns_again_means_nonexist? yes (matched "*")
 cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH
diff --git a/test/stderr/2600 b/test/stderr/2600
index 8fe5708..0c3a59d 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -332,7 +332,6 @@ LOG: MAIN
 created log directory TESTSUITE/spool/log
 search_tidyup called
 fresh-exec forking for local-accept-delivery
-postfork: 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 ....
@@ -415,7 +414,6 @@ search_tidyup called
 no retry data available
 search_tidyup called
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
 changed uid/gid: local delivery to userx <userx@???> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/
diff --git a/test/stderr/2610 b/test/stderr/2610
index c217e6f..525beec 100644
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -325,7 +325,6 @@ LOG: MAIN
 created log directory TESTSUITE/spool/log
 search_tidyup called
 fresh-exec forking for local-accept-delivery
-postfork: 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 ....
@@ -410,7 +409,6 @@ close MYSQL connection: 127.0.0.1:1223/test/root
 no retry data available
 search_tidyup called
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
 changed uid/gid: local delivery to ph10 <ph10@???> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/
diff --git a/test/stderr/2620 b/test/stderr/2620
index 5d57abe..e9fffa5 100644
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -343,7 +343,6 @@ LOG: MAIN
 created log directory TESTSUITE/spool/log
 search_tidyup called
 fresh-exec forking for local-accept-delivery
-postfork: 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 ....
@@ -428,7 +427,6 @@ close PGSQL connection: localhost:1223/test/CALLER
 no retry data available
 search_tidyup called
 local-accept-delivery forking for delivery-local
-postfork: delivery-local
 changed uid/gid: local delivery to CALLER <CALLER@???> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/
diff --git a/test/stderr/4052 b/test/stderr/4052
index f4cbfaa..3de6f82 100644
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -4,7 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -14,7 +13,6 @@ dropping to exim gid; retaining priv uid

>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>

--------> extchange@??? <--------
local-accept-delivery forking for transport
-postfork: transport
smtp transport entered
extchange@???
hostlist:
diff --git a/test/stderr/4520 b/test/stderr/4520
index 852ef4a..52f6792 100644
--- a/test/stderr/4520
+++ b/test/stderr/4520
@@ -4,7 +4,6 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -12,7 +11,6 @@ trusted user
admin user
dropping to exim gid; retaining priv uid
local-accept-delivery forking for transport
-postfork: 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
@@ -31,9 +29,6 @@ cmd buf flush ddd bytes
SMTP<< 250 Accepted
SMTP<< 354 Enter message, ending with "." on a line by itself
DKIM (checking verify key)>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-transport forking for fakens-search
-postfork: fakens-search
-transport forked for fakens-search: npppp
DKIM >> Parsing public key record >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
sel_bad._domainkey.test.ex.
Raw record: v=DKIM1\;{SP}p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXRFf+VhT+lCgFhhSkinZKcFNeRzjYdW8vT29Rbb3NadvTFwAd+cVLPFwZL8H5tUD/7JbUPqNTCPxmpgIL+V5T4tEZMorHatvvUM2qfcpQ45IfsZ+YdhbIiAslHCpy4xNxIR3zylgqRUF4+Dtsaqy3a5LhwMiKCLrnzhXk1F1hxwIDAQAB
diff --git a/test/stderr/4802 b/test/stderr/4802
index f85cd91..e3578a6 100644
--- a/test/stderr/4802
+++ b/test/stderr/4802
@@ -3,17 +3,8 @@ configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of a-aa.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of a-aa.test.ex (A) succeeded
DNS lookup of a-aa.test.ex (A/AAAA) requested AD, but got AA
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

@@ -22,17 +13,8 @@ configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
DNS lookup of mx-aa-a-sec.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
DNS lookup of mx-aa-a-sec.test.ex (MX) requested AD, but got AA
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of a-sec.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of a-sec.test.ex (A) succeeded
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/4803 b/test/stderr/4803
index 46a61ff..9d851dd 100644
--- a/test/stderr/4803
+++ b/test/stderr/4803
@@ -3,17 +3,8 @@ configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of a-aa.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of a-aa.test.ex (A) succeeded
DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
@@ -24,19 +15,10 @@ configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
DNS lookup of mx-aa-a-sec.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of a-sec.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
DNS lookup of a-sec.test.ex (A) succeeded
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/5000 b/test/stderr/5000
index 8d5d1de..d18a8d7 100644
--- a/test/stderr/5000
+++ b/test/stderr/5000
@@ -5,7 +5,6 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -15,7 +14,6 @@ dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>

--------> userx@??? <--------
local-accept-delivery forking for delivery-local
-postfork: delivery-local
appendfile transport entered
appendfile: mode=600 notify_comsat=0 quota=20480 warning=0
directory=TESTSUITE/test-mail format=maildir
diff --git a/test/stderr/5004 b/test/stderr/5004
index fc5dcaa..6735a56 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -47,7 +47,6 @@ LOG: MAIN
created log directory TESTSUITE/spool/log
search_tidyup called
fresh-exec forking for local-accept-delivery
-postfork: 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 ....
@@ -99,7 +98,6 @@ expanded: '# Exim filter
save TESTSUITE/test-mail'
search_tidyup called
local-accept-delivery forking for router-interpret
-postfork: 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)
@@ -146,7 +144,6 @@ search_tidyup called
no retry data available
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: 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=/
diff --git a/test/stderr/5005 b/test/stderr/5005
index c6a8dfd..80e4ba9 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -45,7 +45,6 @@ LOG: MAIN
created log directory TESTSUITE/spool/log
search_tidyup called
fresh-exec forking for local-accept-delivery
-postfork: 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 ....
@@ -118,7 +117,6 @@ search_tidyup called
no retry data available
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: delivery-local
changed uid/gid: local delivery to nofile <nofile@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -239,7 +237,6 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
search_tidyup called
fresh-exec forking for local-accept-delivery
-postfork: 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 ....
@@ -311,7 +308,6 @@ search_tidyup called
no retry data available
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -434,7 +430,6 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
search_tidyup called
fresh-exec forking for local-accept-delivery
-postfork: 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 ....
@@ -506,7 +501,6 @@ search_tidyup called
no retry data available
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -638,7 +632,6 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
search_tidyup called
fresh-exec forking for local-accept-delivery
-postfork: 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 ....
@@ -718,7 +711,6 @@ retry record exists: age=ttt (max 1w)
closed hints database and lockfile
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
diff --git a/test/stderr/5006 b/test/stderr/5006
index 29c492a..405c1c4 100644
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -45,7 +45,6 @@ LOG: MAIN
created log directory TESTSUITE/spool/log
search_tidyup called
fresh-exec forking for local-accept-delivery
-postfork: 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 ....
@@ -118,7 +117,6 @@ search_tidyup called
no retry data available
search_tidyup called
local-accept-delivery forking for delivery-local
-postfork: delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
diff --git a/test/stderr/5008 b/test/stderr/5008
index de69eea..5e140d6 100644
--- a/test/stderr/5008
+++ b/test/stderr/5008
@@ -5,7 +5,6 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -15,7 +14,6 @@ dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>

--------> userx@??? <--------
local-accept-delivery forking for delivery-local
-postfork: delivery-local
appendfile transport entered
appendfile: mode=600 notify_comsat=0 quota=1048576 warning=0
directory=TESTSUITE/test-mail/userx format=maildir
@@ -50,7 +48,6 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -60,7 +57,6 @@ dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>

--------> userx@??? <--------
local-accept-delivery forking for delivery-local
-postfork: delivery-local
appendfile transport entered
appendfile: mode=600 notify_comsat=0 quota=1048576 warning=0
directory=TESTSUITE/test-mail/userx format=maildir
diff --git a/test/stderr/5204 b/test/stderr/5204
index 6f4b0ee..ad7f6b7 100644
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -17,7 +17,6 @@ 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
-postfork: 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)"@???
@@ -41,7 +40,6 @@ 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
-postfork: queryprogram-cmd
fresh-exec forked for queryprogram-cmd: npppp
command wrote: FAIL cannot route this one (FAIL)
q router forced address failure
@@ -63,7 +61,6 @@ 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
-postfork: queryprogram-cmd
fresh-exec forked for queryprogram-cmd: npppp
command wrote: ERROR cannot route this one (ERROR)
LOG: PANIC
@@ -88,7 +85,6 @@ 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
-postfork: 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)"@???
@@ -111,17 +107,10 @@ 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
-postfork: 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
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
queued for other_smtp transport: local_part = ACCEPT transport = other_smtp hosts=ten-1.test.ex
domain = some.host
errors_to=NULL
@@ -148,7 +137,6 @@ 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
-postfork: queryprogram-cmd
fresh-exec forked for queryprogram-cmd: npppp
command wrote: PASS
q router passed for PASS@???
@@ -191,7 +179,6 @@ 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
-postfork: 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)"@???
@@ -214,7 +201,6 @@ 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
-postfork: queryprogram-cmd
fresh-exec forked for queryprogram-cmd: npppp
command wrote: REDIRECT postmaster@???
rda_interpret (string): 'postmaster@???'
@@ -293,7 +279,6 @@ 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
-postfork: queryprogram-cmd
fresh-exec forked for queryprogram-cmd: npppp
command wrote: FAIL cannot route this one (FAIL)
q router forced address failure
diff --git a/test/stdout/0601 b/test/stdout/0601
index 3c2710e..85107ba 100644
--- a/test/stdout/0601
+++ b/test/stdout/0601
@@ -1,7 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+received: message from exim
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaX-0005vi-00
221 the.local.host.name closing connection
-received: message from exim