X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/c5db348c5e29e93e51389fa0079f829967c5da82..fe192666f5de206b57cbbe07a4d90fd4868ea90b:/test/stderr/0315?ds=sidebyside

diff --git a/test/stderr/0315 b/test/stderr/0315
index 13db682d3..9ff377e8b 100644
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -1,8 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
@@ -10,8 +8,7 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
+dropping to exim gid; retaining priv uid
 delivering 10HmaX-0005vi-00
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
@@ -35,7 +32,7 @@ set transport t1
 queued for t1 transport: local_part = y
 domain = ten-1.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=ten-1.test.ex local_part_data=NULL
 routed by r1 router
   envelope to: y@ten-1.test.ex
   transport: t1
@@ -58,21 +55,18 @@ LOG: MAIN
   *> y@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
   Completed
->>>>>>>>>>>>>>>> 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 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
+dropping to exim gid; retaining priv uid
 delivering 10HmaY-0005vi-00
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
@@ -99,7 +93,7 @@ set transport t1
 queued for t1 transport: local_part = y
 domain = ten-2.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r2 router
   envelope to: y@ten-2.test.ex
   transport: t1
@@ -118,7 +112,7 @@ r2 router called for x@ten-2.test.ex
 queued for t1 transport: local_part = x
 domain = ten-2.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r2 router
   envelope to: x@ten-2.test.ex
   transport: t1
@@ -138,5 +132,5 @@ LOG: MAIN
   *> y@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
   Completed
->>>>>>>>>>>>>>>> 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 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>