X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/836c3e4102dae52604590a6674bec10087dbf17e..25cd313cfb1f29f179319daf81de63e989d442a7:/test/stderr/5204

diff --git a/test/stderr/5204 b/test/stderr/5204
index ad7f6b7c9..64f9d9879 100644
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -16,8 +16,6 @@ checking domains
 calling q router
 q router called for "DECLINE cannot route this one (DECLINE)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for queryprogram-cmd
-fresh-exec forked for queryprogram-cmd: npppp
 command wrote: DECLINE cannot route this one (DECLINE)
 q router declined for "DECLINE cannot route this one (DECLINE)"@some.host
 "more" is false: skipping remaining routers
@@ -39,8 +37,6 @@ checking domains
 calling q router
 q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for queryprogram-cmd
-fresh-exec forked for queryprogram-cmd: npppp
 command wrote: FAIL cannot route this one (FAIL)
 q router forced address failure
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
@@ -60,8 +56,6 @@ checking domains
 calling q router
 q router called for "ERROR cannot route this one (ERROR)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for queryprogram-cmd
-fresh-exec forked for queryprogram-cmd: npppp
 command wrote: ERROR cannot route this one (ERROR)
 LOG: PANIC
   q router: bad command yield: ERROR cannot route this one (ERROR)
@@ -84,8 +78,6 @@ checking domains
 calling q router
 q router called for "DEFER cannot route this one (DEFER)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for queryprogram-cmd
-fresh-exec forked for queryprogram-cmd: npppp
 command wrote: DEFER cannot route this one (DEFER)
 q router: defer for "DEFER cannot route this one (DEFER)"@some.host
   message: cannot route this one (DEFER)
@@ -106,15 +98,13 @@ checking domains
 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
-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
 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
@@ -136,8 +126,6 @@ checking domains
 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
-fresh-exec forked for queryprogram-cmd: npppp
 command wrote: PASS
 q router passed for PASS@some.host
 --------> s router <--------
@@ -156,7 +144,7 @@ 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
@@ -178,8 +166,6 @@ checking domains
 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
-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
   message: cannot route this one (FREEZE)
@@ -200,8 +186,6 @@ checking domains
 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
-fresh-exec forked for queryprogram-cmd: npppp
 command wrote: REDIRECT postmaster@test.ex
 rda_interpret (string): 'postmaster@test.ex'
 expanded: 'postmaster@test.ex'
@@ -236,7 +220,7 @@ 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
@@ -258,7 +242,7 @@ 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 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
@@ -278,8 +262,6 @@ q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some
 requires uid=CALLER_UID gid=CALLER_GID current_directory=/
 not running as root: cannot change uid/gid
 subprocess will run with uid=EXIM_UID gid=EXIM_GID
-fresh-exec forking for queryprogram-cmd
-fresh-exec forked for queryprogram-cmd: npppp
 command wrote: FAIL cannot route this one (FAIL)
 q router forced address failure
 ----------- end verify ------------