Testsuite: ignore fakens fork debug line, avoiding ipv6-support differences

32 files changed, 3 insertions, 484 deletions

diff --git a/test/runtest b/test/runtest
index 3e28793c6..fa3f4e07e 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1047,9 +1047,10 @@ 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/;
-    s/ forked for [^:]+: \K\d+/npppp/;
     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 2db95b0e4..7dd84d8eb 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -264,13 +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
-fresh-exec forked for fakens-search: npppp
 IP address lookup yielded "ten-1.test.ex"
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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
@@ -312,15 +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
-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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for 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/0044 b/test/stderr/0044
index 3f19c1c13..34efe6144 100644
--- a/test/stderr/0044
+++ b/test/stderr/0044
@@ -78,14 +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
-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
-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"
@@ -242,8 +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
-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 964e47968..5f08f68d8 100644
--- a/test/stderr/0078
+++ b/test/stderr/0078
@@ -10,20 +10,6 @@ checking domains
 calling lookuphost router
 lookuphost router called for xx@mxt6.test.ex
   domain = mxt6.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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
@@ -46,12 +32,6 @@ checking domains
 calling lookuphost router
 lookuphost router called for myhost.test.ex@mxt1.test.ex
   domain = mxt1.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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@mxt1.test.ex
 --------> self router <--------
@@ -67,10 +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
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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
@@ -92,12 +68,6 @@ checking domains
 calling lookuphost router
 lookuphost router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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@mxt1.test.ex
 --------> self router <--------
@@ -113,10 +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
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 self router passed for xx@mxt1.test.ex
 --------> self2 router <--------
 local_part=xx domain=mxt1.test.ex
@@ -131,10 +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
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 queued for remote_smtp transport: local_part = xx
 domain = mxt1.test.ex
   errors_to=NULL
@@ -156,8 +118,6 @@ checking domains
 calling lookuphost router
 lookuphost router called for xx@not.exist
   domain = not.exist
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 lookuphost router declined for xx@not.exist
 "more" is false: skipping remaining routers
 no more routers
diff --git a/test/stderr/0094 b/test/stderr/0094
index 120ec0d65..eec112538 100644
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -80,26 +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
-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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of oneback.test.ex (A) using fakens
-fresh-exec forking for 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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of host1.masq.test.ex (A) using fakens
-fresh-exec forking for 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 4c5b341a2..b400e228c 100644
--- a/test/stderr/0117
+++ b/test/stderr/0117
@@ -8,20 +8,6 @@ local_part=xxx domain=mxt9.test.ex
 calling lookuphost router
 lookuphost router called for xxx@mxt9.test.ex
   domain = mxt9.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 queued for <unset> transport: local_part = xxx
 domain = mxt9.test.ex
   errors_to=NULL
@@ -43,20 +29,6 @@ local_part=xxx domain=mxt9a.test.ex
 calling lookuphost router
 lookuphost router called for xxx@mxt9a.test.ex
   domain = mxt9a.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 queued for <unset> transport: local_part = xxx
 domain = mxt9a.test.ex
   errors_to=NULL
@@ -78,20 +50,6 @@ local_part=xxx domain=mxt9b.test.ex
 calling lookuphost router
 lookuphost router called for xxx@mxt9b.test.ex
   domain = mxt9b.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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/0161 b/test/stderr/0161
index 50046940c..9ace15fd1 100644
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -15,20 +15,6 @@ checking domains
 calling lookuphost router
 lookuphost router called for xx@mxt6.test.ex
   domain = mxt6.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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
@@ -56,12 +42,6 @@ checking domains
 calling lookuphost router
 lookuphost router called for myhost.test.ex@mxt1.test.ex
   domain = mxt1.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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@mxt1.test.ex
 --------> fail router <--------
@@ -82,10 +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
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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
@@ -112,12 +88,6 @@ checking domains
 calling lookuphost router
 lookuphost router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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@mxt1.test.ex
 --------> fail router <--------
@@ -138,10 +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
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 self router passed for xx@mxt1.test.ex
 --------> self2 router <--------
 local_part=xx domain=mxt1.test.ex
@@ -156,10 +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
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 queued for remote_smtp transport: local_part = xx
 domain = mxt1.test.ex
   errors_to=NULL
@@ -186,8 +148,6 @@ checking domains
 calling lookuphost router
 lookuphost router called for xx@not.exist
   domain = not.exist
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 lookuphost router declined for xx@not.exist
 "more" is false: skipping remaining routers
 no more routers
@@ -205,12 +165,6 @@ checking local_parts
 calling failuphost router
 failuphost router called for ff@mxt1.test.ex
   domain = mxt1.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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 >>>>>>>>>>>>>>>>
@@ -231,12 +185,6 @@ checking domains
 calling lookuphost router
 lookuphost router called for fff@mxt1.test.ex
   domain = mxt1.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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@mxt1.test.ex
 --------> fail router <--------
@@ -253,9 +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
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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/0183 b/test/stderr/0183
index 4ac277eb6..a6a0ad5e7 100644
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -32,8 +32,6 @@ lookuphost router called for userx@test.again.dns
   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
-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
@@ -92,16 +90,12 @@ lookuphost router called for abcd@ten-1.test.ex
   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
-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
-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 
@@ -141,8 +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
-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
@@ -203,8 +195,6 @@ lookuphost router called for xyz@ten-1.test.ex
 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
-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 
@@ -252,8 +242,6 @@ lookuphost router called for userx@test.fail.dns
   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
-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
@@ -311,16 +299,12 @@ lookuphost router called for abcd@ten-1.test.ex
   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
-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
-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 
@@ -360,8 +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
-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
@@ -421,8 +403,6 @@ lookuphost router called for xyz@ten-1.test.ex
 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
-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 
@@ -470,8 +450,6 @@ lookuphost router called for userx@nonexist.test.ex
   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
-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
@@ -532,16 +510,12 @@ lookuphost router called for abcd@ten-1.test.ex
   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
-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
-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 
@@ -581,8 +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
-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
@@ -643,8 +615,6 @@ lookuphost router called for xyz@ten-1.test.ex
 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
-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 
@@ -682,8 +652,6 @@ srv router called for srv@test.again.dns
   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
-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
@@ -706,24 +674,18 @@ srv router called for srv@test.fail.dns
   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
-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
-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
-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
@@ -765,8 +727,6 @@ lookuphost router called for userx@nonexist.example.com
   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
-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
@@ -811,8 +771,6 @@ delay router called for userd@nonexist.example.com
 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
-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/0277 b/test/stderr/0277
index 6c2deaf9d..1c81cc7ae 100644
--- a/test/stderr/0277
+++ b/test/stderr/0277
@@ -16,8 +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
-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
@@ -96,8 +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
-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
@@ -143,8 +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
-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
@@ -190,8 +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
-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 d86fe3396..58fb5e3fc 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -294,18 +294,12 @@ r2 router called for unknown@test.ex
   domain = test.ex
 test.ex in "*"? yes (matched "*")
 DNS lookup of test.ex (MX) using fakens
-fresh-exec forking for 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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of test.ex (A) using fakens
-fresh-exec forking for 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/0315 b/test/stderr/0315
index 79d104a21..b5e05ee23 100644
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -30,12 +30,6 @@ checking domains
 calling r1 router
 r1 router called for y@ten-1.test.ex
   domain = ten-1.test.ex
-local-accept-delivery forking for fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for 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
@@ -101,12 +95,6 @@ local_part=y domain=ten-2.test.ex
 calling r2 router
 r2 router called for y@ten-2.test.ex
   domain = ten-2.test.ex
-local-accept-delivery forking for fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for 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
@@ -127,8 +115,6 @@ local_part=x domain=ten-2.test.ex
 calling r2 router
 r2 router called for x@ten-2.test.ex
   domain = ten-2.test.ex
-local-accept-delivery forking for 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
diff --git a/test/stderr/0360 b/test/stderr/0360
index 06488c634..cad287121 100644
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -105,15 +105,7 @@ checking domains
 calling r1 router
 r1 router called for unknown@recurse.test.ex
   domain = recurse.test.ex
-local-accept-delivery forking for 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
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for 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@recurse.test.ex.test.ex
@@ -134,8 +126,6 @@ checking domains
 calling r1 router
 r1 router called for unknown@recurse.test.ex.test.ex
   domain = recurse.test.ex.test.ex
-local-accept-delivery forking for 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
diff --git a/test/stderr/0361 b/test/stderr/0361
index eaffcb7ea..475ffcc92 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -100,8 +100,6 @@ r1 router called for kilos@recurse.test.ex
   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
-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
@@ -109,18 +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
-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
-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
-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 
diff --git a/test/stderr/0364 b/test/stderr/0364
index d81db8c01..f3df336ad 100644
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -73,8 +73,6 @@ checking domains
 calling r2 router
 r2 router called for solik@otherhost.test.ex
   domain = otherhost.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 r2 router declined for solik@otherhost.test.ex
 --------> r3 router <--------
 local_part=solik domain=otherhost.test.ex
@@ -101,8 +99,6 @@ checking domains
 calling r2 router
 r2 router called for solik@otherhost.sub.test.ex
   domain = otherhost.sub.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 r2 router declined for solik@otherhost.sub.test.ex
 --------> r3 router <--------
 local_part=solik domain=otherhost.sub.test.ex
@@ -145,12 +141,6 @@ checking domains
 calling r2 router
 r2 router called for xxx@ten-1.test.ex
   domain = ten-1.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 set transport t1
 queued for t1 transport: local_part = xxx
 domain = ten-1.test.ex
@@ -186,8 +176,6 @@ checking domains
 calling r2 router
 r2 router called for xxx@testsub.test.ex
   domain = testsub.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 r2 router declined for xxx@testsub.test.ex
 --------> r3 router <--------
 local_part=xxx domain=testsub.test.ex
@@ -214,12 +202,6 @@ checking domains
 calling r2 router
 r2 router called for xxx@testsub.sub.test.ex
   domain = testsub.sub.test.ex
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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 7201e5d18..9bf935f8b 100644
--- a/test/stderr/0368
+++ b/test/stderr/0368
@@ -2,40 +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
-fresh-exec forked for fakens-search: npppp
 discarded duplicate host ten-1.test.ex (MX=8)
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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
@@ -44,20 +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
-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
-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
-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/0381 b/test/stderr/0381
index 06492ca6c..648d9f6c6 100644
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -38,26 +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
-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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of x.gov.uk.test.ex (A) using fakens
-fresh-exec forking for 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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of x.co.uk.test.ex (A) using fakens
-fresh-exec forking for 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/0386 b/test/stderr/0386
index 999a1f3e7..cc84e8832 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -195,14 +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
-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
-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"
diff --git a/test/stderr/0419 b/test/stderr/0419
index 73021fec7..1a1564d24 100644
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -24,20 +24,10 @@ dnslookup router called for k@mxt13.test.ex
   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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of mxt13.test.ex (MX) succeeded
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of other1.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of other1.test.ex (A) succeeded
-fresh-exec forking for fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of other2.test.ex (A) using fakens
-fresh-exec forking for 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 a99fbfce8..b776c924c 100644
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -28,13 +28,7 @@ local_part=x domain=uppercase.test.ex
 calling r1 router
 r1 router called for x@uppercase.test.ex
   domain = uppercase.test.ex
-local-accept-delivery forking for fakens-search
-local-accept-delivery forked for fakens-search: npppp
 uppercase.test.ex (MX resp) DNSSEC
-local-accept-delivery forking for fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for 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 
diff --git a/test/stderr/0463 b/test/stderr/0463
index 7269ef213..d85af39d7 100644
--- a/test/stderr/0463
+++ b/test/stderr/0463
@@ -17,8 +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
-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
@@ -30,18 +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
-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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of ten-1 (A) using fakens
-fresh-exec forking for 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 
@@ -56,8 +48,6 @@ routing x@ten-1.test.ex
 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
-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
@@ -69,18 +59,12 @@ all router called for x@ten-1.test.ex
   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
-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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for 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 69befba5e..3401dedff 100644
--- a/test/stderr/0469
+++ b/test/stderr/0469
@@ -20,12 +20,8 @@ r1 router called for x@mxt1c.test.ex
   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
-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
-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/0499 b/test/stderr/0499
index d2080c975..9a48f3a7e 100644
--- a/test/stderr/0499
+++ b/test/stderr/0499
@@ -17,12 +17,8 @@ routing ph@mxt1.test.ex
 local_part=ph domain=mxt1.test.ex
 checking domains
 DNS lookup of mxt1.test.ex (MX) using fakens
-fresh-exec forking for 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
-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:
@@ -31,12 +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
-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
-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/0543 b/test/stderr/0543
index be841dc3d..72a6d44a2 100644
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -35,10 +35,6 @@ After routing:
   Deferred addresses:
 qrun-delivery forking for transport
 qrun-delivery forked for transport: npppp
-transport forking for fakens-search
-transport forked for fakens-search: npppp
-transport forking for fakens-search
-transport forked for fakens-search: npppp
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-smtp.lockfile
 LOG: MAIN
diff --git a/test/stderr/0545 b/test/stderr/0545
index d4679571c..964648f44 100644
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -20,26 +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
-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
-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
-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
-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
@@ -58,19 +50,13 @@ dns router called for userx@alias-eximtesthost.test.ex
   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
-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
-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
-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
@@ -109,26 +95,18 @@ dns router called for userx@alias-eximtesthost.test.ex
   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
-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
-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
-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
-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/1006 b/test/stderr/1006
index 0aaebd760..77a5a8478 100644
--- a/test/stderr/1006
+++ b/test/stderr/1006
@@ -3,36 +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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of mx46.test.ex (MX) succeeded
-fresh-exec forking for 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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of 46.test.ex (A) succeeded
-fresh-exec forking for 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
-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
-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
-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
-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
@@ -43,27 +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
-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
-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
-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
-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
-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/2200 b/test/stderr/2200
index c057f7f82..7ea33c610 100644
--- a/test/stderr/2200
+++ b/test/stderr/2200
@@ -10,8 +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
-fresh-exec forked for fakens-search: npppp
  lookup yielded: 127.0.0.1
  search_open: dnsdb "NULL"
    cached open
@@ -37,8 +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
-fresh-exec forked for fakens-search: npppp
   lookup yielded: 127.0.0.1
   search_open: dnsdb "NULL"
     cached open
@@ -49,8 +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
-fresh-exec forked for fakens-search: npppp
   lookup yielded: 127.0.0.1
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
diff --git a/test/stderr/2201 b/test/stderr/2201
index 259204d6a..f2e03cb1a 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -36,8 +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
-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")
@@ -99,8 +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
-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
@@ -133,8 +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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of myhost.test.ex (A) succeeded
 lookup yielded: V4NET.10.10.10
 CALLER@myhost.test.ex in "dnsdb;A=myhost.test.ex"? yes (matched "dnsdb;A=myhost.test.ex")
@@ -165,8 +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
-fresh-exec forked for fakens-search: npppp
 lookup yielded: 127.0.0.1
 search_open: dnsdb "NULL"
   cached open
@@ -186,8 +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
-fresh-exec forked for fakens-search: npppp
 lookup yielded: 127.0.0.1
 LOG: MAIN
   <= a@shorthost.test.ex U=CALLER P=local S=sss
@@ -218,18 +208,10 @@ 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 daemon-accept forking for fakens-search
-ppppp daemon-accept forked for fakens-search: npppp
-ppppp daemon-accept forking for 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 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 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
@@ -237,12 +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 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 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@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
diff --git a/test/stderr/2202 b/test/stderr/2202
index 7fb459fa0..f9dd8121c 100644
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -39,8 +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
-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
@@ -50,13 +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
-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
-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 
@@ -67,8 +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
-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/4520 b/test/stderr/4520
index a7beb7a73..65b173aee 100644
--- a/test/stderr/4520
+++ b/test/stderr/4520
@@ -29,8 +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
-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 36dcc450d..e3578a608 100644
--- a/test/stderr/4802
+++ b/test/stderr/4802
@@ -3,14 +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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
-fresh-exec forking for 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
-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 >>>>>>>>>>>>>>>>
@@ -19,14 +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
-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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of a-sec.test.ex (A) using fakens
-fresh-exec forking for 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 764e5469c..9d851dd85 100644
--- a/test/stderr/4803
+++ b/test/stderr/4803
@@ -3,14 +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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
-fresh-exec forking for 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
-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 *))
@@ -21,16 +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
-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
-fresh-exec forked for fakens-search: npppp
 DNS lookup of a-sec.test.ex (A) using fakens
-fresh-exec forking for 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/5204 b/test/stderr/5204
index b60144347..ad7f6b7c9 100644
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -111,10 +111,6 @@ 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
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for 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