X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/cc5a3f43827026193110cb663151a95eac4ee379..9aba085b920ab3b8cdd1085db917145785ca24cf:/test/stderr/0161?ds=sidebyside

diff --git a/test/stderr/0161 b/test/stderr/0161
index 3a806f3de..6a8449d8d 100644
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -1,11 +1,7 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt6.test.ex
 --------> failuphost router <--------
@@ -23,20 +19,16 @@ set transport remote_smtp
 queued for remote_smtp transport: local_part = xx
 domain = mxt6.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by lookuphost router
   envelope to: xx@mxt6.test.ex
   transport: remote_smtp
-  host ten-1.test.ex [V4NET.0.0.1] MX=5
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+  host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing myhost.test.ex@mxt1.test.ex
 --------> failuphost router <--------
@@ -65,28 +57,24 @@ calling self router
 self router called for myhost.test.ex@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname
-original list of hosts = "$local_part" options = byname
-expanded list of hosts = "myhost.test.ex" options = byname
+original list of hosts = '$local_part' options = 'byname'
+expanded list of hosts = 'myhost.test.ex' options = 'byname'
 set transport remote_smtp
 finding IP address for myhost.test.ex
 calling host_find_byname
 queued for remote_smtp transport: local_part = myhost.test.ex
 domain = mxt1.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by self router
   envelope to: myhost.test.ex@mxt1.test.ex
   transport: remote_smtp
   host myhost.test.ex [V4NET.10.10.10]
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt1.test.ex
 --------> failuphost router <--------
@@ -115,8 +103,8 @@ calling self router
 self router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname
-original list of hosts = "$local_part" options = byname
-expanded list of hosts = "xx" options = byname
+original list of hosts = '$local_part' options = 'byname'
+expanded list of hosts = 'xx' options = 'byname'
 set transport remote_smtp
 finding IP address for xx
 calling host_find_byname
@@ -129,53 +117,45 @@ calling self2 router
 self2 router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * myhost.test.ex byname
-original list of hosts = "myhost.test.ex" options = byname
-expanded list of hosts = "myhost.test.ex" options = byname
+original list of hosts = 'myhost.test.ex' options = 'byname'
+expanded list of hosts = 'myhost.test.ex' options = 'byname'
 set transport remote_smtp
 finding IP address for myhost.test.ex
 calling host_find_byname
 queued for remote_smtp transport: local_part = xx
 domain = mxt1.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by self2 router
   envelope to: xx@mxt1.test.ex
   transport: remote_smtp
   host myhost.test.ex [V4NET.10.10.10]
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-routing xx@not.exist
+routing xx@not-exist.test.ex
 --------> failuphost router <--------
-local_part=xx domain=not.exist
+local_part=xx domain=not-exist.test.ex
 checking domains
 checking local_parts
 failuphost router skipped: local_parts mismatch
 --------> lookuphost router <--------
-local_part=xx domain=not.exist
+local_part=xx domain=not-exist.test.ex
 checking domains
 calling lookuphost router
-lookuphost router called for xx@not.exist
-  domain = not.exist
-lookuphost router declined for xx@not.exist
+lookuphost router called for xx@not-exist.test.ex
+  domain = not-exist.test.ex
+lookuphost router declined for xx@not-exist.test.ex
 "more" is false: skipping remaining routers
 no more routers
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing ff@mxt1.test.ex
 --------> failuphost router <--------
@@ -187,15 +167,11 @@ failuphost router called for ff@mxt1.test.ex
   domain = mxt1.test.ex
 lowest numbered MX record points to local host: mxt1.test.ex: address failed (self = fail)
 failuphost router forced address failure
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing fff@mxt1.test.ex
 --------> failuphost router <--------
@@ -220,10 +196,10 @@ calling fail router
 fail router called for fff@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname
-original list of hosts = "$local_part" options = byname
-expanded list of hosts = "fff" options = byname
+original list of hosts = '$local_part' options = 'byname'
+expanded list of hosts = 'fff' options = 'byname'
 set transport remote_smtp
 finding IP address for fff
 calling host_find_byname
 fail router forced address failure
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>