X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0d2e392e281e96d9f9f2f3dd438affe3f2563c57..1d2868b2d90c230dd4ae42e6f3c7e4958ed75de5:/test/stderr/0378

diff --git a/test/stderr/0378 b/test/stderr/0378
index dec065131..3ee15ba8f 100644
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -20,10 +20,13 @@ routing aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=aaaa domain=myhost.test.ex
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
+aaaa in local_parts? no (end of list)
 defer router skipped: local_parts mismatch
 --------> aaaa_2nd_time router <--------
 local_part=aaaa domain=myhost.test.ex
@@ -44,6 +47,7 @@ text "This is an autoreply"' (tainted)
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
+>>>>>>>>>>>>>>>> Exim pid=p1237 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@myhost.test.ex
@@ -89,6 +93,8 @@ routing defer_aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=defer_aaaa domain=myhost.test.ex
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=defer_aaaa domain=myhost.test.ex
@@ -118,7 +124,7 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
-  <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
+  <= <> R=10HmaX-000000005vi-0000 U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -152,8 +158,8 @@ After routing:
   Deferred addresses:
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (autoreply) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => >CALLER@myhost.test.ex <aaaa@myhost.test.ex> R=aaaa T=t3
 locking TESTSUITE/spool/db/retry.lockfile
@@ -164,14 +170,14 @@ locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => TESTSUITE/test-mail/file <aaaa@myhost.test.ex> R=aaaa T=t1
 locking TESTSUITE/spool/db/retry.lockfile
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
-  Start queue run: pid=pppp -qf
+  Start queue run: pid=p1234 -qf
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex
@@ -182,10 +188,13 @@ routing aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=aaaa domain=myhost.test.ex
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
+aaaa in local_parts? no (end of list)
 defer router skipped: local_parts mismatch
 --------> aaaa_2nd_time router <--------
 local_part=aaaa domain=myhost.test.ex
@@ -213,10 +222,13 @@ routing aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=aaaa domain=myhost.test.ex
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
+aaaa in local_parts? no (end of list)
 defer router skipped: local_parts mismatch
 --------> aaaa_2nd_time router <--------
 aaaa_2nd_time router skipped: previously routed aaaa@myhost.test.ex
@@ -234,6 +246,7 @@ text "This is an autoreply"' (tainted)
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
+>>>>>>>>>>>>>>>> Exim pid=p1240 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@myhost.test.ex
@@ -278,6 +291,8 @@ routing defer_aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=defer_aaaa domain=myhost.test.ex
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=defer_aaaa domain=myhost.test.ex
@@ -300,6 +315,7 @@ After routing:
   Deferred addresses:
     defer_aaaa@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
-  End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+  End queue run: pid=p1234 -qf
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>