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

diff --git a/test/runtest b/test/runtest
index c381d6d6881d4c707f080ffae9a7f09d77c4b486..6e6ed4092a9bba95306156c68bf796c46ff76f2d 100755 (executable)
--- 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 995a193fefb25a8164feb875793d21604db0d237..7dd84d8eba7cb1c5509eb3419cac5f74a4944931 100644 (file)
--- 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 96bf58e71c56034919a40c078ca34ca6c1b73416..c752fb7bfdb2a1d19ed483ac26ffd98b4306eb39 100644 (file)
--- 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 127db67e17f1801324a68db8f12e80c49a472f41..a300abbe65044c1346d74e7862285f2ba1b55b46 100644 (file)
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -5,7 +5,6 @@ admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 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@test.ex
   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@test.ex> R=user_accept2 T=appendfile

diff --git a/test/stderr/0044 b/test/stderr/0044
index 275ba99917d7995e69d723b30bcd89358c052fd0..34efe6144e8bc3b026e9e59342e24a503b559661 100644 (file)
--- 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 fafb81e56f73512188744ad21c56d8993847e066..5f08f68d8f4bcd8f8b46dd8461ab413146c7f63c 100644 (file)
--- a/test/stderr/0078
+++ b/test/stderr/0078
@@ -10,27 +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
-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@mxt1.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@mxt1.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@mxt1.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 xx@mxt1.test.ex
 --------> 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@mxt1.test.ex
 --------> 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@not.exist
   domain = not.exist
-fresh-exec forking for fakens-search
-postfork: 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 355c68b860cd4fc065a3925ce0fcdd2f420b4e0d..eec11253819b21b09638b92142c2263c2ed56d6a 100644 (file)
--- 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 6b40b8233800d84152c3ba0b5fa4f4b3f3ee0cae..b400e228c6c89db2c247ff715d75bff36bddb5eb 100644 (file)
--- 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@mxt9.test.ex
   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@mxt9a.test.ex
   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@mxt9b.test.ex
   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 15f53cc2cdd62db1d40c771387bd3c22f841403c..07fd508dbcca2f070db4c0faad61fdf32ca2c5f7 100644 (file)
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -16,7 +15,7 @@ router_name <my_main_router>
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userx@domain.com <--------
 local-accept-delivery forking for transport
-postfork: transport
+local-accept-delivery forked for transport: npppp
 transport_name <my_smtp>
 my_smtp transport entered
   userx@domain.com
@@ -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@domain.com 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 b3eb4ea1648300865fb130c9cdace656f7d0b022..9ace15fd1edfa193dc8c505def5980000bf298f1 100644 (file)
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -15,27 +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
-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@mxt1.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@mxt1.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@mxt1.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 xx@mxt1.test.ex
 --------> 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@mxt1.test.ex
 --------> 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@not.exist
   domain = not.exist
-fresh-exec forking for fakens-search
-postfork: 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
@@ -225,15 +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
-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@mxt1.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 fff@mxt1.test.ex
 --------> 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 f64cb79960246d3b5d750e720bc91230c9b5b2e3..40297679c54a46a3f2cf51a7dad23c98634a67e7 100644 (file)
--- a/test/stderr/0169
+++ b/test/stderr/0169
@@ -4,7 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -14,7 +13,7 @@ dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@myhost.test.ex <--------
 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@myhost.test.ex
 added retry item for T:userx@myhost.test.ex: errno=dd more_errno=dd flags=1
 LOG: MAIN

diff --git a/test/stderr/0183 b/test/stderr/0183
index 6e18963e15c6b86543e6265633febd4758ee6d64..a6a0ad5e7e7f4ca3da9539fc13efb1b166c054c9 100644 (file)
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -32,9 +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
-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@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
-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
 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@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
-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@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
-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
 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@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
-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@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
-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
 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@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
-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@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
-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@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
-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
 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 a2ae61e51c96acf2fed90b628677ed96a7fb0864..bbf2b52b9380b655198bc2afa2d6cd9952f85a10 100644 (file)
--- 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@test.ex>
   SMTP>> RCPT TO:<b@test.ex>
   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@test.ex F=<CALLER@test.ex> 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@test.ex>: 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@test.ex 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@test.ex F=<CALLER@test.ex> 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@test.ex>: 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@test.ex>
   SMTP>> RCPT TO:<c@test.ex>
   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 055b67a82ac5d90e9d6f074ebfea03bc1451c950..57b377ce5fa4b811ad2ddd9e5ca37e1b0dd7dd60 100644 (file)
--- 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@test.ex U=CALLER P=local S=sss
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config

diff --git a/test/stderr/0275 b/test/stderr/0275
index 52536e3c5c07994c70e3856eb399275db657eba5..965fc8c6a49c94dee8e442b6c04aeb32633a0f0e 100644 (file)
--- 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@test.ex> 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@test.ex
 t1 transport returned OK for userx@test.ex
 post-process userx@test.ex (0)

diff --git a/test/stderr/0277 b/test/stderr/0277
index 7132101da09475087b1e36cb48d87a0b4fa4d341..1c81cc7aec06c2a429c6fe621bc88d1f5deb59ec 100644 (file)
--- 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 bea5f6422a34b10b68e35d1b02ea8bfc83bcbe8d..58fb5e3fc83509969a306244e139792ae87cdda6 100644 (file)
--- 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@test.ex> 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@test.ex
 t1 transport returned OK for CALLER@test.ex
 post-process CALLER@test.ex (0)
@@ -296,21 +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
-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 9b70f1de9c2ba5e6f83b22b2e6fe4e7c921604b7..9f8da0855d8b201f7be609cc4bc06ade38769c08 100644 (file)
--- a/test/stderr/0283
+++ b/test/stderr/0283
@@ -15,7 +15,6 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
@@ -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@myhost.test.ex> 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@myhost.test.ex> transport=t2
   uid=CALLER_UID gid=CALLER_GID pid=pppp
-local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => CALLER <CALLER@myhost.test.ex> R=caller T=t2
 changed uid/gid: post-delivery tidying
@@ -114,7 +107,6 @@ getpwnam() succeeded uid=uuuu gid=gggg
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
@@ -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@myhost.test.ex 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 f3bad3730715b9c94a0e5687d36d6f1a0b19c6f4..b5e05ee232ae2ff78f9cb34fdf6558103c2b1f89 100644 (file)
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@the.local.host.name 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@ten-1.test.ex
   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@ten-1.test.ex 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@the.local.host.name 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@ten-2.test.ex
   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@ten-2.test.ex
   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@ten-2.test.ex 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 388a29de9f62eef97d8b8e262ad06e4d3ea5661b..197af3f37c84ab75ef33c4ee83ccfdf96df560bb 100644 (file)
--- 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@no.delay
@@ -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@no.delay 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@test.again.dns
 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@no.delay 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@test.again.dns
@@ -114,7 +109,6 @@ After routing:
   Deferred addresses:
     delay@test.again.dns
 >>>>>>>>>>>>>>>> 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 21bac8348aa5938b2f703a80f402e1ee2e08333d..39605663fc82edc52ded92e24319d03ced7be882 100644 (file)
--- 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@no.delay 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@test.again.dns
 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@no.delay 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 619ee4a9749097eaf176da67c0648f0ac61194db..bde398c56133146908c71d5d21d20cbd6cc934db 100644 (file)
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 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@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
-local-accept-delivery forked for transport: npppp
 reading retry information for R:userx@test.ex:<CALLER@test.ex> 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@test.ex
@@ -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@test.ex:<CALLER@test.ex>: 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@test.ex:<CALLER@test.ex> 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@test.ex
@@ -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@test.ex:<CALLER@test.ex>: 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@test.ex:<CALLER@test.ex> 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@test.ex
@@ -208,7 +202,6 @@ Deferred addresses:
  userx@test.ex: 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 90758b2c48c4bdcc1170263ca119678ff7215a4a..9208e426ad8f214730b24a84849694e510bfc447 100644 (file)
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 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@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
 added retry item for R:usery@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
-local-accept-delivery forked for transport: npppp
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   added retry item
 reading retry information for R:usery@test.ex:<CALLER@test.ex> 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@test.ex
@@ -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@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
 added retry item for R:usery@test.ex:<CALLER@test.ex>: 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@test.ex:<CALLER@test.ex> from subprocess
   existing delete item dropped
   added retry item

diff --git a/test/stderr/0360 b/test/stderr/0360
index 2d7e6aa652aef872126f64b4aa613737d4e96f56..cad28712142f05544b6f38d1bd391c8056994b44 100644 (file)
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -106,19 +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
-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@recurse.test.ex.test.ex
@@ -139,9 +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
-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@test.ex
 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@recurse.test.ex.test.ex <cms@test.ex> 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@test.ex
 >>>>>>>>>>>>>>>> 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 b595778881268f5dfb5931ee20b5c18c2e16a7be..475ffcc9295e165aac6ff003122c7ef21782fcb5 100644 (file)
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -51,9 +51,8 @@ LOG: MAIN
   <= CALLER@test.ex 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@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
-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@recurse.test.ex.test.ex> 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@recurse.test.ex.test.ex/t2
 t2 transport returned OK for kilos@recurse.test.ex.test.ex
 post-process kilos@recurse.test.ex.test.ex (0)

diff --git a/test/stderr/0364 b/test/stderr/0364
index 3e349bb9130ba5bc44aa74803fa819a74b9b7c6f..f3df336add9d66a9e5cb0afc29844870430e9915 100644 (file)
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -73,9 +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
-postfork: 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
@@ -102,9 +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
-postfork: 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
@@ -147,15 +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
-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@testsub.test.ex
   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@testsub.test.ex
 --------> r3 router <--------
 local_part=xxx domain=testsub.test.ex
@@ -220,15 +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
-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 5246e110a1feb9dddaed8eeb66161b289a7fd520..9bf935f8bb1cd49d701edeaffa650a8a0254a127 100644 (file)
--- 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 fb5b1d45d7d628d5411e20abe9ef3a7d5598fb17..73504d280e575c4e095ea75b63e0a358ee2127e7 100644 (file)
--- a/test/stderr/0370
+++ b/test/stderr/0370
@@ -9,7 +9,6 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
@@ -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 d1d1b99b665e6ea478ba6e12cc9b9193073f6aa4..87c60cf69a7c5793f47fa6bb81ec6b938407db30 100644 (file)
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 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@myhost.test.ex> 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@myhost.test.ex> 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@myhost.test.ex> 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@myhost.test.ex> 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@myhost.test.ex> 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@myhost.test.ex> 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@myhost.test.ex> 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex>: 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@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 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@myhost.test.ex> R=real T=real

diff --git a/test/stderr/0375 b/test/stderr/0375
index 405a38ac09136619b9bc8af191cb8270a6d1cc55..fb56cbc767a3ac3082510e67a2500399fdd21e7f 100644 (file)
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -761,80 +760,66 @@ After routing:
     g1@myhost.test.ex
 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@myhost.test.ex> P=<CALLER@myhost.test.ex> 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@myhost.test.ex> P=<CALLER@myhost.test.ex> 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@myhost.test.ex> P=<CALLER@myhost.test.ex> 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@myhost.test.ex> P=<CALLER@myhost.test.ex> 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@myhost.test.ex> P=<CALLER@myhost.test.ex> 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@myhost.test.ex> P=<CALLER@myhost.test.ex> 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@myhost.test.ex> P=<CALLER@myhost.test.ex> 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@myhost.test.ex> P=<CALLER@myhost.test.ex> 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@myhost.test.ex> P=<CALLER@myhost.test.ex> 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@myhost.test.ex> P=<CALLER@myhost.test.ex> 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@myhost.test.ex> 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex>: 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@myhost.test.ex P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 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@myhost.test.ex P=<> R=ut5 T=ut5 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e1@myhost.test.ex>: 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@myhost.test.ex P=<CALLER@myhost.test.ex> 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@myhost.test.ex 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@myhost.test.ex>: 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@myhost.test.ex P=<CALLER@myhost.test.ex> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f3@myhost.test.ex>: 550 hard error
 log writing disabled
@@ -913,7 +888,6 @@ LOG: MAIN
   f3@myhost.test.ex <f3@myhost.test.ex>: 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@myhost.test.ex> P=<> R=real T=real
@@ -1012,7 +984,6 @@ admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 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@myhost.test.ex> P=<CALLER@myhost.test.ex> 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@myhost.test.ex> P=<CALLER@myhost.test.ex> R=ut8 T=ut1

diff --git a/test/stderr/0377 b/test/stderr/0377
index e6f31d3456fffb5800eed8ff849a13a8623e5c0c..593542c9214b84986b5f3732c599630cdeedb07b 100644 (file)
--- a/test/stderr/0377
+++ b/test/stderr/0377
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -303,19 +302,16 @@ After routing:
     defer_cccc@myhost.test.ex
 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@myhost.test.ex> 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@myhost.test.ex> 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@myhost.test.ex> 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@myhost.test.ex
@@ -566,7 +562,6 @@ aaaa@myhost.test.ex was previously delivered (t1 transport): discarded
 bbbb@myhost.test.ex 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@myhost.test.ex
@@ -814,7 +809,6 @@ aaaa@myhost.test.ex was previously delivered (t1 transport): discarded
 bbbb@myhost.test.ex 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 26f87e98b28eb18a2b4913f1273ab6656f5dd850..332b81b4d09934fe1e960a02236b684e4033ba7a 100644 (file)
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 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@myhost.test.ex
@@ -122,10 +120,8 @@ After routing:
     defer_aaaa@myhost.test.ex
 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@myhost.test.ex <aaaa@myhost.test.ex> 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@myhost.test.ex> 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@myhost.test.ex> 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@myhost.test.ex
@@ -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@myhost.test.ex

diff --git a/test/stderr/0379 b/test/stderr/0379
index bfcfa32eb7e45ba233eeaae0512a95f98cedecb1..09087ad0561737312c0fd6264f670cfe36fad93b 100644 (file)
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -130,13 +129,11 @@ After routing:
     defer@myhost.test.ex
 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@myhost.test.ex> 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@myhost.test.ex> 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@myhost.test.ex
@@ -180,7 +177,6 @@ After routing:
     defer@myhost.test.ex
 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 2e84ee4fa8ef1441d12448f505863ff2ac62928b..9e43cbbce7dcd5a2570d4c2c0bcbcd17113e19b5 100644 (file)
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -83,7 +82,6 @@ After routing:
     aaaa@myhost.test.ex
 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@myhost.test.ex> R=r3 T=t1

diff --git a/test/stderr/0381 b/test/stderr/0381
index 2dcb7a712680b906e498a735fc5c63342420e215..648d9f6c65389d66a788854007a97cd9e8ee3e28 100644 (file)
--- 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 44293f1e78db8d7772ac39dffc65ec29fc45997d..3640b8f8e9410a57ee2257d0d238d4d96d4caf77 100644 (file)
--- a/test/stderr/0382
+++ b/test/stderr/0382
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -19,7 +18,6 @@ system filter returned 1
 LOG: MAIN
   ** userx@test.ex 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 c2061ffad2f35dfe9678be76b1dd8da46f1fba30..cc84e8832419a78a300295786ce3e205e174816c 100644 (file)
--- 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 64646c6077df164725261c185a104d46fb51a52c..512f340211b538c471185807c2258ae21483c03e 100644 (file)
--- 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 d3e3862f7b87511eb06380d289fb5524673bb6e0..d9c77b13c32d3960f506004e373dd9637d7f4faa 100644 (file)
--- a/test/stderr/0393
+++ b/test/stderr/0393
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -15,7 +14,7 @@ dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 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@test.ex U=CALLER P=local S=sss
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -75,7 +70,7 @@ dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 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@test.ex
 LOG: MAIN
   => userx <userx@test.ex> R=r1 T=t1
@@ -109,7 +103,6 @@ admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -119,7 +112,7 @@ dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 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@test.ex
 LOG: MAIN
   => userx <userx@test.ex> R=r1 T=t1

diff --git a/test/stderr/0402 b/test/stderr/0402
index 4a70c7308f5022b5908f04f15f29124ebd12c083..ccc2b2745ff45cf315cec89d0680d1efc6e872ae 100644 (file)
--- 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@test.ex
 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@test.ex
 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@test.ex> 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@test.ex
 t1 transport returned OK for CALLER@test.ex
 post-process CALLER@test.ex (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@test.ex> 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@test.ex
 t1 transport returned OK for usery@test.ex
 post-process usery@test.ex (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@test.ex> 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@test.ex
 t2 transport returned OK for userz@test.ex
 post-process userz@test.ex (0)

diff --git a/test/stderr/0403 b/test/stderr/0403
index 126c38f7615ef1c5052075a3a575d2bc183c0d47..ec8ebde39616da227b66b80bc7c1de36391589f4 100644 (file)
--- 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@test.ex
 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 8185fcbe53f45e570bfba0ba93c9254caafd3616..e417f77927763ce40df95dee58ea5c13b44e5a84 100644 (file)
--- 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@test.ex)
   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@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...
@@ -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@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... <>sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...> 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@test.ex 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@test.ex> 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@test.ex
 t2 transport returned OK for sender@test.ex
 post-process sender@test.ex (0)

diff --git a/test/stderr/0408 b/test/stderr/0408
index e83fad6567af42db29d54dfd3a2540a4153b8ec6..2891a2ce96b2e1b9925e84ccc83bcc5c4704ac3e 100644 (file)
--- 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@test.ex> 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@test.ex
 t1 transport returned OK for userx@test.ex
 post-process userx@test.ex (0)

diff --git a/test/stderr/0419 b/test/stderr/0419
index 0af69e98d88d703396ec3d26ab0b7f34cc60f0d1..1a1564d243b343b91d4d9a6484d096c371053760 100644 (file)
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -24,25 +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
-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 8353cfb294c3b99ee05d2fd8370bc792dc9a688f..b776c924c6748a7866491458570e6c6083e246e6 100644 (file)
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 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@uppercase.test.ex
   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@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: 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 8f4b59a516f69be1171fbeee0d6818e4862cf140..ad13502ba95b98e7ba6166932e6e083dcf6f3e9a 100644 (file)
--- 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 ee623d52d9907744a8c4aca2c721931f0f13a551..9bb49b0b8f90bb87bb9b1e27268b9aaa0e97738e 100644 (file)
--- 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@myhost.test.ex> 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@myhost.test.ex> R=r1 T=t1
 LOG: MAIN

diff --git a/test/stderr/0438 b/test/stderr/0438
index eb5cef8aa34c4a44fa536e07b8b740ad9b449264..0dc65a13a8f78b9288cee0d03decc9e117a8bd32 100644 (file)
--- 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 31d6662eca5dcddf7aaba1369ff0dce585bf7034..d310614c891a30d80ee3004ee8b71b2c3aad4f39 100644 (file)
--- a/test/stderr/0450
+++ b/test/stderr/0450
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -15,7 +14,7 @@ dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 local-accept-delivery forking for transport
-postfork: transport
+local-accept-delivery forked for transport: npppp
 t1 transport entered
   userx@test.ex
 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@test.ex <--------
 qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
 t1 transport entered
   userx@test.ex
 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 10fd4da799e4023b59687d990b59cae301b41788..d85af39d7dccf77ecba1f8c1860c7a51cb60814c 100644 (file)
--- 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@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
-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@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
-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 0a07f4c45d80992f19cbb9efb4a28a4afa47b96d..3401dedffb8ba067df33d750bd7623974f6ce39c 100644 (file)
--- a/test/stderr/0469
+++ b/test/stderr/0469
@@ -20,14 +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
-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 d88b3a8b2329b8da0610ce862c37e058a78cb427..f89294e8a292a4de234f8a5ca5495034d5f0f1e5 100644 (file)
--- 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@test.ex <--------
 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@test.ex
@@ -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@test.ex: result OK
 Leaving t1 transport
 set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@test.ex 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@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 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@the.local.host.name <--------
 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@the.local.host.name
@@ -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@the.local.host.name: 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@test.ex <--------
 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@test.ex
@@ -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@test.ex 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 3149a112406e22e275190ef55a56b03278a53906..436b343fbf997f9395cbffc08ea17bae705960f1 100644 (file)
--- 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@test.ex> 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@test.ex
 t1 transport returned OK for userx@test.ex
 post-process userx@test.ex (0)

diff --git a/test/stderr/0499 b/test/stderr/0499
index 653a47689d6180335f52d189ebda96b09a98548e..9a48f3a7ef7c40bb5b7e39b23f59dc75a8fda3ae 100644 (file)
--- a/test/stderr/0499
+++ b/test/stderr/0499
@@ -17,14 +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
-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 240fd3513e2798af5b0fefd696a46f0942863df1..4161f97610be92f65f690a8d48dc8d6c3c3ae10e 100644 (file)
--- 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@myhost.test.ex <--------
 qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
 t1 transport entered
   userx@myhost.test.ex
 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@myhost.test.ex: 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@myhost.test.ex <--------
 qrun-delivery forking for transport
-postfork: transport
+qrun-delivery forked for transport: npppp
 t1 transport entered
   userx@myhost.test.ex
 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@myhost.test.ex: 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 b8edd82feee25085b2a848a28bcfe08cee57e6e3..24b48baebcd68f9f56ca0378ad279ba85642a20c 100644 (file)
--- a/test/stderr/0529
+++ b/test/stderr/0529
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 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@test.ex: 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@test.ex
@@ -93,7 +91,6 @@ Deferred addresses:
  x@test.ex: 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 43cf03cdf3b4410a121076f8f85878039f059785..72a6d44a240dbd258dabf17f3153be2cdd11bbe5 100644 (file)
--- 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 fa7e2d711a5b58e63cf15a1cf7eafb76652a3200..66da14d3c73ad010207469e93f076cc4ec85a051 100644 (file)
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -120,7 +120,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 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@domain1.ex 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 33d28941280c9d930c148c660702dc7aa032ed90..964648f444019ee7b547fc4de0c6dcf485ed2c99 100644 (file)
--- 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@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
-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@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
-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 7b8afc098304ec47b1f2c5ab0993ee7b90134708..8e91438d5fb96a77352058fdd22a8b84f309a6ee 100644 (file)
--- 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@myhost.test.ex>: errno=-44 more_errno=dd,A flags=0
-fresh-exec forked for transport: npppp
 reading retry information for R:x@y:<CALLER@myhost.test.ex> 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@myhost.test.ex>: 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 2cef9ecfd6f98f91bbcf0a1426827fa3814646c8..a6027e8e7b68a7d5ff5f8aa258f576f59c7c8eae 100644 (file)
--- 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 0cb661df95e915b4035fe092ed482b9c81cec64d..77a5a847805770e22d92820d303679e56dc09e5f 100644 (file)
--- 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 e0a951cc980c0af04138833efcfea4ca2c36cf85..5bd20c216d0fac8b29411d7d8e6d46820a098769 100644 (file)
--- 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 c25718713d80d9d4bf499e9c3e61370628a474b9..070012d1183429b29d9119e92c25808dd3932071 100644 (file)
--- 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@test.ex 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@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userz@test.ex>
   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@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<usery@test.ex>
   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@test.ex 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@test.ex 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@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userc@test.ex>
   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@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userb@test.ex>
   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@test.ex 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 d1bcefb4dfda052e7cf5016a3e3a18a6dec120d8..2ea5ca57840befa0ddc76d2800fc072fd7841612 100644 (file)
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -36,16 +36,13 @@ sync_responses expect rcpt
 LOG: MAIN
   <= CALLER@myhost.test.ex 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@test.ex <--------
 local-accept-delivery forking for transport
-postfork: transport
+local-accept-delivery forked for transport: npppp
 t1 transport entered
   userb@test.ex
 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 00f475d762a8a877ac0210270a713d35528478a9..f8b52f06de9587f8af8f683e92a9459ab14c958d 100644 (file)
--- 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@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userz@test.ex>
   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@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<usery@test.ex>
   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@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userc@test.ex>
   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@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userb@test.ex>
   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 d1bcefb4dfda052e7cf5016a3e3a18a6dec120d8..b836e5e5aaf5c33d9f82802bfe8048bb0776b8b8 100644 (file)
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -36,15 +36,12 @@ sync_responses expect rcpt
 LOG: MAIN
   <= CALLER@myhost.test.ex 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@test.ex <--------
 local-accept-delivery forking for transport
-postfork: transport
 t1 transport entered
   userb@test.ex
 hostlist:

diff --git a/test/stderr/2200 b/test/stderr/2200
index 667c71b29725ea135996d4ed25429adb4636a7e9..7ea33c610e335ebe60fa5589c6f6139cd7bb8952 100644 (file)
--- 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@myhost.test.ex U=CALLER P=local S=sss

diff --git a/test/stderr/2201 b/test/stderr/2201
index 405818c0792126a18ce6bc3b02d8cf41066e269b..fd1452a89015f68b14cd0a130094fa6e440f1a2e 100644 (file)
--- 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@myhost.test.ex 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@shorthost.test.ex 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@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
@@ -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 ab3290633cd8df2c700ac427473ac977da574db3..f9dd8121cc1a76739c794600bd33791a5dae30e3 100644 (file)
--- 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 8fe57084df69a9a5cdd379fa75adb971bd4c8f43..0c3a59d14f1082cd3bcbae9936e978c7172b46ba 100644 (file)
--- 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@myhost.test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/

diff --git a/test/stderr/2610 b/test/stderr/2610
index c217e6fa632511fc41dea5f5631bcaf877465c4b..525beec36eb962d3dd2a3ce3deb51fd217e665ba 100644 (file)
--- 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@myhost.test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/

diff --git a/test/stderr/2620 b/test/stderr/2620
index 5d57abe3bf1363965c466d8580162b87d53fff51..e9fffa59fdd2745ca9d9c7c135797317f20ed6cc 100644 (file)
--- 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@myhost.test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/

diff --git a/test/stderr/4052 b/test/stderr/4052
index f4cbfaaa85c4e21bda322fac8eb4d4c11cd95a1d..3de6f8289624d8590c78007dc18c35cce4b02211 100644 (file)
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -4,7 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@the.local.host.name 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@test.ex <--------
 local-accept-delivery forking for transport
-postfork: transport
 smtp transport entered
   extchange@test.ex
 hostlist:

diff --git a/test/stderr/4520 b/test/stderr/4520
index 852ef4ad3b2bedfe199852f8c497e9597af07df2..52f67926f710f922957a4d703489e5a50556afbd 100644 (file)
--- a/test/stderr/4520
+++ b/test/stderr/4520
@@ -4,7 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 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 f85cd916272cf730b16f7fdbf0201510cdc52e2f..e3578a6083284eb0c5ae3e5edc6f20fd2f5356bc 100644 (file)
--- 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 46a61ffbc0809f49a02ec9855a3058d2be2792ea..9d851dd856b869cee23ce1d3a65cbfb624373f82 100644 (file)
--- 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 8d5d1de2f84852ebc747a9f1190e3143741f4d0e..d18a8d7c2be7d4f7e132ddb932568c5f222b6613 100644 (file)
--- a/test/stderr/5000
+++ b/test/stderr/5000
@@ -5,7 +5,6 @@ admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -15,7 +14,6 @@ dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@myhost.test.ex <--------
 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 fc5dcaafedf360496219f847ae4730b003247385..6735a56d082c0f2230a7be603769aaa6c8d2396a 100644 (file)
--- 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@test.ex)
   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 c6a8dfdbbe71484a2095b713c96e8f1175efbe36..80e4ba93f7bf617a6bfa120482565895f3afd2e6 100644 (file)
--- 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@test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/
@@ -239,7 +237,6 @@ LOG: MAIN
   <= CALLER@test.ex 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@test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/
@@ -434,7 +430,6 @@ LOG: MAIN
   <= CALLER@test.ex 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@test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/
@@ -638,7 +632,6 @@ LOG: MAIN
   <= CALLER@test.ex 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@test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/

diff --git a/test/stderr/5006 b/test/stderr/5006
index 29c492a42fc1f7f8adc639825237159d518b62ae..405c1c475768a53f263173ad399be7d76cd4ce0d 100644 (file)
--- 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@test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/

diff --git a/test/stderr/5008 b/test/stderr/5008
index de69eea642b7f650ad347bb493273e39a9aeb2cd..5e140d6e2d550901cbe7d91e4cdc67cc1a432ff2 100644 (file)
--- a/test/stderr/5008
+++ b/test/stderr/5008
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -15,7 +14,6 @@ dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 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@test.ex U=CALLER P=local S=sss
 fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -60,7 +57,6 @@ dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 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 6f4b0ee20a6cf5ea93952b2c8182c6d8e3a51aba..ad7f6b7c961be4f54b0ebc0b51afb2ea3dc94f73 100644 (file)
--- 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)"@some.host: 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)"@some.host
@@ -41,7 +40,6 @@ calling q router
 q router called for "FAIL cannot route this one (FAIL)"@some.host: 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)"@some.host: 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)"@some.host: 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)"@some.host
@@ -111,17 +107,10 @@ calling q router
 q router called for "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host: 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@some.host: 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@some.host
@@ -191,7 +179,6 @@ calling q router
 q router called for "FREEZE cannot route this one (FREEZE)"@some.host: 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)"@some.host
@@ -214,7 +201,6 @@ calling q router
 q router called for "REDIRECT postmaster@test.ex"@some.host: 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@test.ex
 rda_interpret (string): 'postmaster@test.ex'
@@ -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 3c2710ecfa6091ee35b7777f96197d4e482a9fb5..85107ba74119272471677840aae217f13acc3b87 100644 (file)
--- 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\r
+received:  message from exim
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
-received:  message from exim