X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/568092148bf6ade68174fa1ccf34b8c37d9064e9..cf4659b914328be054abb5706fd7f2649db9a8ac:/test/stderr/0264

diff --git a/test/stderr/0264 b/test/stderr/0264
index 2beb125bc..f6d2fe6b0 100644
--- a/test/stderr/0264
+++ b/test/stderr/0264
@@ -1,64 +1,65 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
-Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-0005vi-00
-DSN: Write SPOOL: -dsn_envid NULL
-DSN: Write SPOOL  :-dsn_ret 0
-DSN: Flags: 0x0
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <rz.b@outside> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
-Renaming spool header file: TESTSUITE/spool//input//10HmbJ-0005vi-00-H
+Renaming spool header file: TESTSUITE/spool//input//10HmbJ-000000005vi-0000-H
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-delivering 10HmbJ-0005vi-00
-Trying spool file TESTSUITE/spool//input//10HmbJ-0005vi-00-D
-reading spool file 10HmbJ-0005vi-00-H
+delivering 10HmbJ-000000005vi-0000
+Trying spool file TESTSUITE/spool//input//10HmbJ-000000005vi-0000-D
+reading spool file 10HmbJ-000000005vi-0000-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
-Empty Tree
+ Empty Tree
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   rz.b@outside 
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: rz.b@outside
 unique = rz.b@outside
-have domain  retry record; next_try = now+0
-no   address retry record
+checking router retry status
+ have domain  retry record; next_try = now+0
+ no   address retry record
 rz.b@outside: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing rz.b@outside
 --------> r1 router <--------
 local_part=rz.b domain=outside
 checking domains
+outside in domains? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=rz.b domain=outside
 checking domains
+outside in domains? no (end of list)
 r2 router skipped: domains mismatch
 --------> r3 router <--------
 local_part=rz.b domain=outside
 checking local_parts
+rz.b in local_parts? no (end of list)
 r3 router skipped: local_parts mismatch
 --------> r4 router <--------
 local_part=rz.b domain=outside
 checking local_parts
+rz.b in local_parts? no (end of list)
 r4 router skipped: local_parts mismatch
 --------> r5 router <--------
 local_part=rz.b domain=outside
 checking local_parts
+rz.b in local_parts? no (end of list)
 r5 router skipped: local_parts mismatch
 --------> r_remain router <--------
 local_part=rz.b domain=outside
@@ -83,26 +84,26 @@ After routing:
     rz.b@outside
 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>
 Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- rz.b@outside
-locking TESTSUITE/spool/db/retry.lockfile
-retry for R:outside = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:outside
-  first failed=dddd last try=dddd next try=+300 expired=0
-  errno=-1 more_errno=dd not just now
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+  rz.b@outside
+   *@outside in "^\*@r5domain.ex"? no (end of list)
+   *@outside in "userx@test.ex"? no (end of list)
+   outside in "test.ex"? no (end of list)
+   *@outside in "test.ex"? no (end of list)
+   retry for R:outside = * 0 0
+   failing_interval=ttt message_age=ttt
+   Writing retry data for R:outside
+     first failed=dddd last try=dddd next try=+300 expired=0
+     errno=-1 more_errno=dd not just now
 end of retry processing
-time on queue = 0s  id 10HmbJ-0005vi-00  addr rz.b@outside
+time on queue = 0s  id 10HmbJ-000000005vi-0000  addr rz.b@outside
 warning counts: required 0 done 0
 delivery deferred: update_spool=1 header_rewritten=0
-Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-0005vi-00
-DSN: Write SPOOL: -dsn_envid NULL
-DSN: Write SPOOL  :-dsn_ret 0
-DSN: Flags: 0x0
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <rz.b@outside> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
-Renaming spool header file: TESTSUITE/spool//input//10HmbJ-0005vi-00-H
-end delivery of 10HmbJ-0005vi-00
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+Renaming spool header file: TESTSUITE/spool//input//10HmbJ-000000005vi-0000-H
+end delivery of 10HmbJ-000000005vi-0000
+>>>>>>>>>>>>>>>> Exim pid=p1240 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>