X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/1d717e1c110562fd6bf28478c79f180cafeba776..fed38d88886d069738a444110f10b0c60d867ac0:/test/stderr/5204?ds=sidebyside

diff --git a/test/stderr/5204 b/test/stderr/5204
index f84acadd8..63238c27c 100644
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -20,7 +20,7 @@ command wrote: DECLINE cannot route this one (DECLINE)
 q router declined for "DECLINE cannot route this one (DECLINE)"@some.host
 "more" is false: skipping remaining routers
 no more routers
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
@@ -39,7 +39,7 @@ q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 command wrote: FAIL cannot route this one (FAIL)
 q router forced address failure
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
@@ -61,7 +61,7 @@ LOG: PANIC
   q router: bad command yield: ERROR cannot route this one (ERROR)
 q router: defer for "ERROR cannot route this one (ERROR)"@some.host
   message: bad command yield: ERROR cannot route this one (ERROR)
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
@@ -81,7 +81,7 @@ requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 command wrote: DEFER cannot route this one (DEFER)
 q router: defer for "DEFER cannot route this one (DEFER)"@some.host
   message: cannot route this one (DEFER)
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
@@ -104,12 +104,12 @@ doing DNS lookup
 queued for other_smtp transport: local_part = ACCEPT transport = other_smtp hosts=ten-1.test.ex
 domain = some.host
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by q router
   envelope to: "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
   transport: other_smtp
   host ten-1.test.ex [V4NET.0.0.1]
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
@@ -144,12 +144,12 @@ remote host address is the local host: some.host: configured to try delivery any
 queued for smtp transport: local_part = pass
 domain = some.host
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by s router
   envelope to: PASS@some.host
   transport: smtp
   host 127.0.0.1 [127.0.0.1]
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
@@ -169,7 +169,7 @@ requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 command wrote: FREEZE cannot route this one (FREEZE)
 q router: defer for "FREEZE cannot route this one (FREEZE)"@some.host
   message: cannot route this one (FREEZE)
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
@@ -220,11 +220,11 @@ set transport null
 queued for null transport: local_part = postmaster
 domain = test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=postmaster
 routed by pm router
   envelope to: postmaster@test.ex
   transport: null
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
@@ -238,24 +238,37 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
+some.name in helo_lookup_domains?
+ list element: @
+ list element: @[]
 some.name in helo_lookup_domains? no (end of list)
 host in dsn_advertise_hosts? no (option unset)
-host in pipelining_advertise_hosts? yes (matched "*")
+host in pipelining_advertise_hosts?
+ list element: *
+  host in pipelining_advertise_hosts? yes (matched "*")
+host in chunking_advertise_hosts?
 host in chunking_advertise_hosts? no (end of list)
-processing "accept" (TESTSUITE/test-config 78)
+processing "accept" (TESTSUITE/test-config 79)
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "FAIL cannot route this one (FAIL)"@some.host
 --------> b router <--------
 local_part=fail cannot route this one (fail) domain=some.host
 checking senders
-y in ""? no (end of list)
+x@y in ":"?
+ list element: 
+ y in ""?
+ y in ""? no (end of list)
 x@y in ":"? no (end of list)
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=FAIL cannot route this one (FAIL) domain=some.host
 checking domains
-some.host in "test.ex"? no (end of list)
+some.host in "! +local_domains"?
+ list element: ! +local_domains
+ some.host in "test.ex"?
+  list element: test.ex
+ some.host in "test.ex"? no (end of list)
 some.host in "! +local_domains"? yes (end of list)
 calling q router
 q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some.host
@@ -270,5 +283,5 @@ end of inline ACL: implicit DENY
 LOG: MAIN REJECT
   H=(some.name) [V4NET.2.3.4] F=<x@y> rejected RCPT <"FAIL cannot route this one (FAIL)"@some.host>: cannot route this one (FAIL)
 LOG: smtp_connection MAIN
-  SMTP connection from (some.name) [V4NET.2.3.4] closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+  SMTP connection from (some.name) [V4NET.2.3.4] D=qqs closed by QUIT
+>>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>