X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/c5db348c5e29e93e51389fa0079f829967c5da82..436c0d208b49421d3d126f7c284bc3130b50ff14:/test/stderr/0374

diff --git a/test/stderr/0374 b/test/stderr/0374
index ea6803720..cf5659d3f 100644
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -1,11 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: real propagating DSN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
@@ -13,11 +8,7 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: real propagating DSN
+dropping to exim gid; retaining priv uid
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -68,7 +59,7 @@ set transport ut4
 queued for ut4 transport: local_part = d3
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=^d\d
 routed by ut4 router (unseen)
   envelope to: d3@myhost.test.ex
   transport: ut4
@@ -96,7 +87,7 @@ ut4 router called for d2@myhost.test.ex
 queued for ut4 transport: local_part = d2
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=^d\d
 routed by ut4 router (unseen)
   envelope to: d2@myhost.test.ex
   transport: ut4
@@ -124,7 +115,7 @@ ut4 router called for d1@myhost.test.ex
 queued for ut4 transport: local_part = d1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=^d\d
 routed by ut4 router (unseen)
   envelope to: d1@myhost.test.ex
   transport: ut4
@@ -149,7 +140,7 @@ set transport ut3
 queued for ut3 transport: local_part = c1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=^c\d
 routed by ut3 router (unseen)
   envelope to: c1@myhost.test.ex
   transport: ut3
@@ -170,7 +161,7 @@ set transport ut2
 queued for ut2 transport: local_part = b1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=^b\d
 routed by ut2 router (unseen)
   envelope to: b1@myhost.test.ex
   transport: ut2
@@ -187,7 +178,7 @@ set transport ut1
 queued for ut1 transport: local_part = a1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=^a\d
 routed by u1 router (unseen)
   envelope to: a1@myhost.test.ex
   transport: ut1
@@ -390,22 +381,13 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: real propagating DSN
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: real propagating DSN
+dropping to exim gid; retaining priv uid
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@myhost.test.ex
@@ -454,7 +436,7 @@ LOG: MAIN
   => CALLER <CALLER@myhost.test.ex> R=real T=real
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>