git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Docs: point out that a DKIM private key file needs to be readable
[exim.git] / test / stderr / 0375
diff --git a/test/stderr/0375 b/test/stderr/0375
index 37ed2d839bff155af196b341287fd27fb0c8afe9..323cfe7f02661a2a8e7ae582668bbcb5a84436d2 100644 (file)
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -1,14 +1,16 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-locking TESTSUITE/spool/db/retry.lockfile
+dropping to exim gid; retaining priv uid
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: a1@myhost.test.ex
@@ -59,26 +61,32 @@ routing g1@myhost.test.ex
 --------> u1 router <--------
 local_part=g1 domain=myhost.test.ex
 checking local_parts
+g1 in local_parts? no (end of list)
 u1 router skipped: local_parts mismatch
 --------> ut2 router <--------
 local_part=g1 domain=myhost.test.ex
 checking local_parts
+g1 in local_parts? no (end of list)
 ut2 router skipped: local_parts mismatch
 --------> ut3 router <--------
 local_part=g1 domain=myhost.test.ex
 checking local_parts
+g1 in local_parts? no (end of list)
 ut3 router skipped: local_parts mismatch
 --------> ut4 router <--------
 local_part=g1 domain=myhost.test.ex
 checking local_parts
+g1 in local_parts? no (end of list)
 ut4 router skipped: local_parts mismatch
 --------> ut5 router <--------
 local_part=g1 domain=myhost.test.ex
 checking local_parts
+g1 in local_parts? no (end of list)
 ut5 router skipped: local_parts mismatch
 --------> ut6 router <--------
 local_part=g1 domain=myhost.test.ex
 checking local_parts
+g1 in local_parts? no (end of list)
 ut6 router skipped: local_parts mismatch
 --------> ut7 router <--------
 local_part=g1 domain=myhost.test.ex
@@ -92,22 +100,27 @@ routing f3@myhost.test.ex
 --------> u1 router <--------
 local_part=f3 domain=myhost.test.ex
 checking local_parts
+f3 in local_parts? no (end of list)
 u1 router skipped: local_parts mismatch
 --------> ut2 router <--------
 local_part=f3 domain=myhost.test.ex
 checking local_parts
+f3 in local_parts? no (end of list)
 ut2 router skipped: local_parts mismatch
 --------> ut3 router <--------
 local_part=f3 domain=myhost.test.ex
 checking local_parts
+f3 in local_parts? no (end of list)
 ut3 router skipped: local_parts mismatch
 --------> ut4 router <--------
 local_part=f3 domain=myhost.test.ex
 checking local_parts
+f3 in local_parts? no (end of list)
 ut4 router skipped: local_parts mismatch
 --------> ut5 router <--------
 local_part=f3 domain=myhost.test.ex
 checking local_parts
+f3 in local_parts? no (end of list)
 ut5 router skipped: local_parts mismatch
 --------> ut6 router <--------
 local_part=f3 domain=myhost.test.ex
@@ -120,7 +133,7 @@ set transport ut6
 queued for ut6 transport: local_part = f3
 domain = myhost.test.ex
   errors_to=
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=^f\d
 routed by ut6 router (unseen)
   envelope to: f3@myhost.test.ex
   transport: ut6
@@ -131,22 +144,27 @@ routing f2@myhost.test.ex
 --------> u1 router <--------
 local_part=f2 domain=myhost.test.ex
 checking local_parts
+f2 in local_parts? no (end of list)
 u1 router skipped: local_parts mismatch
 --------> ut2 router <--------
 local_part=f2 domain=myhost.test.ex
 checking local_parts
+f2 in local_parts? no (end of list)
 ut2 router skipped: local_parts mismatch
 --------> ut3 router <--------
 local_part=f2 domain=myhost.test.ex
 checking local_parts
+f2 in local_parts? no (end of list)
 ut3 router skipped: local_parts mismatch
 --------> ut4 router <--------
 local_part=f2 domain=myhost.test.ex
 checking local_parts
+f2 in local_parts? no (end of list)
 ut4 router skipped: local_parts mismatch
 --------> ut5 router <--------
 local_part=f2 domain=myhost.test.ex
 checking local_parts
+f2 in local_parts? no (end of list)
 ut5 router skipped: local_parts mismatch
 --------> ut6 router <--------
 local_part=f2 domain=myhost.test.ex
@@ -158,7 +176,7 @@ ut6 router called for f2@myhost.test.ex
 queued for ut6 transport: local_part = f2
 domain = myhost.test.ex
   errors_to=
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=^f\d
 routed by ut6 router (unseen)
   envelope to: f2@myhost.test.ex
   transport: ut6
@@ -169,22 +187,27 @@ routing f1@myhost.test.ex
 --------> u1 router <--------
 local_part=f1 domain=myhost.test.ex
 checking local_parts
+f1 in local_parts? no (end of list)
 u1 router skipped: local_parts mismatch
 --------> ut2 router <--------
 local_part=f1 domain=myhost.test.ex
 checking local_parts
+f1 in local_parts? no (end of list)
 ut2 router skipped: local_parts mismatch
 --------> ut3 router <--------
 local_part=f1 domain=myhost.test.ex
 checking local_parts
+f1 in local_parts? no (end of list)
 ut3 router skipped: local_parts mismatch
 --------> ut4 router <--------
 local_part=f1 domain=myhost.test.ex
 checking local_parts
+f1 in local_parts? no (end of list)
 ut4 router skipped: local_parts mismatch
 --------> ut5 router <--------
 local_part=f1 domain=myhost.test.ex
 checking local_parts
+f1 in local_parts? no (end of list)
 ut5 router skipped: local_parts mismatch
 --------> ut6 router <--------
 local_part=f1 domain=myhost.test.ex
@@ -196,7 +219,7 @@ ut6 router called for f1@myhost.test.ex
 queued for ut6 transport: local_part = f1
 domain = myhost.test.ex
   errors_to=
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=^f\d
 routed by ut6 router (unseen)
   envelope to: f1@myhost.test.ex
   transport: ut6
@@ -207,18 +230,22 @@ routing e1@myhost.test.ex
 --------> u1 router <--------
 local_part=e1 domain=myhost.test.ex
 checking local_parts
+e1 in local_parts? no (end of list)
 u1 router skipped: local_parts mismatch
 --------> ut2 router <--------
 local_part=e1 domain=myhost.test.ex
 checking local_parts
+e1 in local_parts? no (end of list)
 ut2 router skipped: local_parts mismatch
 --------> ut3 router <--------
 local_part=e1 domain=myhost.test.ex
 checking local_parts
+e1 in local_parts? no (end of list)
 ut3 router skipped: local_parts mismatch
 --------> ut4 router <--------
 local_part=e1 domain=myhost.test.ex
 checking local_parts
+e1 in local_parts? no (end of list)
 ut4 router skipped: local_parts mismatch
 --------> ut5 router <--------
 local_part=e1 domain=myhost.test.ex
@@ -230,7 +257,7 @@ set transport ut5
 queued for ut5 transport: local_part = e1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=^e\d
 routed by ut5 router (unseen)
   envelope to: e1@myhost.test.ex
   transport: ut5
@@ -240,14 +267,17 @@ routing d3@myhost.test.ex
 --------> u1 router <--------
 local_part=d3 domain=myhost.test.ex
 checking local_parts
+d3 in local_parts? no (end of list)
 u1 router skipped: local_parts mismatch
 --------> ut2 router <--------
 local_part=d3 domain=myhost.test.ex
 checking local_parts
+d3 in local_parts? no (end of list)
 ut2 router skipped: local_parts mismatch
 --------> ut3 router <--------
 local_part=d3 domain=myhost.test.ex
 checking local_parts
+d3 in local_parts? no (end of list)
 ut3 router skipped: local_parts mismatch
 --------> ut4 router <--------
 local_part=d3 domain=myhost.test.ex
@@ -259,7 +289,7 @@ set transport ut4
 queued for ut4 transport: local_part = d3
 domain = myhost.test.ex
   errors_to=
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=^d\d
 routed by ut4 router (unseen)
   envelope to: d3@myhost.test.ex
   transport: ut4
@@ -270,14 +300,17 @@ routing d2@myhost.test.ex
 --------> u1 router <--------
 local_part=d2 domain=myhost.test.ex
 checking local_parts
+d2 in local_parts? no (end of list)
 u1 router skipped: local_parts mismatch
 --------> ut2 router <--------
 local_part=d2 domain=myhost.test.ex
 checking local_parts
+d2 in local_parts? no (end of list)
 ut2 router skipped: local_parts mismatch
 --------> ut3 router <--------
 local_part=d2 domain=myhost.test.ex
 checking local_parts
+d2 in local_parts? no (end of list)
 ut3 router skipped: local_parts mismatch
 --------> ut4 router <--------
 local_part=d2 domain=myhost.test.ex
@@ -288,7 +321,7 @@ ut4 router called for d2@myhost.test.ex
 queued for ut4 transport: local_part = d2
 domain = myhost.test.ex
   errors_to=
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=^d\d
 routed by ut4 router (unseen)
   envelope to: d2@myhost.test.ex
   transport: ut4
@@ -299,14 +332,17 @@ routing d1@myhost.test.ex
 --------> u1 router <--------
 local_part=d1 domain=myhost.test.ex
 checking local_parts
+d1 in local_parts? no (end of list)
 u1 router skipped: local_parts mismatch
 --------> ut2 router <--------
 local_part=d1 domain=myhost.test.ex
 checking local_parts
+d1 in local_parts? no (end of list)
 ut2 router skipped: local_parts mismatch
 --------> ut3 router <--------
 local_part=d1 domain=myhost.test.ex
 checking local_parts
+d1 in local_parts? no (end of list)
 ut3 router skipped: local_parts mismatch
 --------> ut4 router <--------
 local_part=d1 domain=myhost.test.ex
@@ -317,7 +353,7 @@ ut4 router called for d1@myhost.test.ex
 queued for ut4 transport: local_part = d1
 domain = myhost.test.ex
   errors_to=
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=^d\d
 routed by ut4 router (unseen)
   envelope to: d1@myhost.test.ex
   transport: ut4
@@ -328,10 +364,12 @@ routing c1@myhost.test.ex
 --------> u1 router <--------
 local_part=c1 domain=myhost.test.ex
 checking local_parts
+c1 in local_parts? no (end of list)
 u1 router skipped: local_parts mismatch
 --------> ut2 router <--------
 local_part=c1 domain=myhost.test.ex
 checking local_parts
+c1 in local_parts? no (end of list)
 ut2 router skipped: local_parts mismatch
 --------> ut3 router <--------
 local_part=c1 domain=myhost.test.ex
@@ -343,7 +381,7 @@ set transport ut3
 queued for ut3 transport: local_part = c1
 domain = myhost.test.ex
   errors_to=
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=^c\d
 routed by ut3 router (unseen)
   envelope to: c1@myhost.test.ex
   transport: ut3
@@ -354,6 +392,7 @@ routing b1@myhost.test.ex
 --------> u1 router <--------
 local_part=b1 domain=myhost.test.ex
 checking local_parts
+b1 in local_parts? no (end of list)
 u1 router skipped: local_parts mismatch
 --------> ut2 router <--------
 local_part=b1 domain=myhost.test.ex
@@ -365,7 +404,7 @@ set transport ut2
 queued for ut2 transport: local_part = b1
 domain = myhost.test.ex
   errors_to=
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=^b\d
 routed by ut2 router (unseen)
   envelope to: b1@myhost.test.ex
   transport: ut2
@@ -383,13 +422,12 @@ set transport ut1
 queued for ut1 transport: local_part = a1
 domain = myhost.test.ex
   errors_to=
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=^a\d
 routed by u1 router (unseen)
   envelope to: a1@myhost.test.ex
   transport: ut1
   errors to 
 "unseen" set: replicated a1@myhost.test.ex
-locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: a1@myhost.test.ex
@@ -436,10 +474,12 @@ routing f3@myhost.test.ex
 --------> ut7 router <--------
 local_part=f3 domain=myhost.test.ex
 checking local_parts
+f3 in local_parts? no (end of list)
 ut7 router skipped: local_parts mismatch
 --------> ut8 router <--------
 local_part=f3 domain=myhost.test.ex
 checking local_parts
+f3 in local_parts? no (end of list)
 ut8 router skipped: local_parts mismatch
 --------> real router <--------
 local_part=f3 domain=myhost.test.ex
@@ -450,7 +490,7 @@ set transport real
 queued for real transport: local_part = f3
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by real router
   envelope to: f3@myhost.test.ex
   transport: real
@@ -459,10 +499,12 @@ routing f2@myhost.test.ex
 --------> ut7 router <--------
 local_part=f2 domain=myhost.test.ex
 checking local_parts
+f2 in local_parts? no (end of list)
 ut7 router skipped: local_parts mismatch
 --------> ut8 router <--------
 local_part=f2 domain=myhost.test.ex
 checking local_parts
+f2 in local_parts? no (end of list)
 ut8 router skipped: local_parts mismatch
 --------> real router <--------
 local_part=f2 domain=myhost.test.ex
@@ -472,7 +514,7 @@ real router called for f2@myhost.test.ex
 queued for real transport: local_part = f2
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by real router
   envelope to: f2@myhost.test.ex
   transport: real
@@ -481,10 +523,12 @@ routing f1@myhost.test.ex
 --------> ut7 router <--------
 local_part=f1 domain=myhost.test.ex
 checking local_parts
+f1 in local_parts? no (end of list)
 ut7 router skipped: local_parts mismatch
 --------> ut8 router <--------
 local_part=f1 domain=myhost.test.ex
 checking local_parts
+f1 in local_parts? no (end of list)
 ut8 router skipped: local_parts mismatch
 --------> real router <--------
 local_part=f1 domain=myhost.test.ex
@@ -494,7 +538,7 @@ real router called for f1@myhost.test.ex
 queued for real transport: local_part = f1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by real router
   envelope to: f1@myhost.test.ex
   transport: real
@@ -503,14 +547,17 @@ routing e1@myhost.test.ex
 --------> ut6 router <--------
 local_part=e1 domain=myhost.test.ex
 checking local_parts
+e1 in local_parts? no (end of list)
 ut6 router skipped: local_parts mismatch
 --------> ut7 router <--------
 local_part=e1 domain=myhost.test.ex
 checking local_parts
+e1 in local_parts? no (end of list)
 ut7 router skipped: local_parts mismatch
 --------> ut8 router <--------
 local_part=e1 domain=myhost.test.ex
 checking local_parts
+e1 in local_parts? no (end of list)
 ut8 router skipped: local_parts mismatch
 --------> real router <--------
 local_part=e1 domain=myhost.test.ex
@@ -520,7 +567,7 @@ real router called for e1@myhost.test.ex
 queued for real transport: local_part = e1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by real router
   envelope to: e1@myhost.test.ex
   transport: real
@@ -529,18 +576,22 @@ routing d3@myhost.test.ex
 --------> ut5 router <--------
 local_part=d3 domain=myhost.test.ex
 checking local_parts
+d3 in local_parts? no (end of list)
 ut5 router skipped: local_parts mismatch
 --------> ut6 router <--------
 local_part=d3 domain=myhost.test.ex
 checking local_parts
+d3 in local_parts? no (end of list)
 ut6 router skipped: local_parts mismatch
 --------> ut7 router <--------
 local_part=d3 domain=myhost.test.ex
 checking local_parts
+d3 in local_parts? no (end of list)
 ut7 router skipped: local_parts mismatch
 --------> ut8 router <--------
 local_part=d3 domain=myhost.test.ex
 checking local_parts
+d3 in local_parts? no (end of list)
 ut8 router skipped: local_parts mismatch
 --------> real router <--------
 local_part=d3 domain=myhost.test.ex
@@ -550,7 +601,7 @@ real router called for d3@myhost.test.ex
 queued for real transport: local_part = d3
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by real router
   envelope to: d3@myhost.test.ex
   transport: real
@@ -559,18 +610,22 @@ routing d2@myhost.test.ex
 --------> ut5 router <--------
 local_part=d2 domain=myhost.test.ex
 checking local_parts
+d2 in local_parts? no (end of list)
 ut5 router skipped: local_parts mismatch
 --------> ut6 router <--------
 local_part=d2 domain=myhost.test.ex
 checking local_parts
+d2 in local_parts? no (end of list)
 ut6 router skipped: local_parts mismatch
 --------> ut7 router <--------
 local_part=d2 domain=myhost.test.ex
 checking local_parts
+d2 in local_parts? no (end of list)
 ut7 router skipped: local_parts mismatch
 --------> ut8 router <--------
 local_part=d2 domain=myhost.test.ex
 checking local_parts
+d2 in local_parts? no (end of list)
 ut8 router skipped: local_parts mismatch
 --------> real router <--------
 local_part=d2 domain=myhost.test.ex
@@ -580,7 +635,7 @@ real router called for d2@myhost.test.ex
 queued for real transport: local_part = d2
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by real router
   envelope to: d2@myhost.test.ex
   transport: real
@@ -589,18 +644,22 @@ routing d1@myhost.test.ex
 --------> ut5 router <--------
 local_part=d1 domain=myhost.test.ex
 checking local_parts
+d1 in local_parts? no (end of list)
 ut5 router skipped: local_parts mismatch
 --------> ut6 router <--------
 local_part=d1 domain=myhost.test.ex
 checking local_parts
+d1 in local_parts? no (end of list)
 ut6 router skipped: local_parts mismatch
 --------> ut7 router <--------
 local_part=d1 domain=myhost.test.ex
 checking local_parts
+d1 in local_parts? no (end of list)
 ut7 router skipped: local_parts mismatch
 --------> ut8 router <--------
 local_part=d1 domain=myhost.test.ex
 checking local_parts
+d1 in local_parts? no (end of list)
 ut8 router skipped: local_parts mismatch
 --------> real router <--------
 local_part=d1 domain=myhost.test.ex
@@ -610,7 +669,7 @@ real router called for d1@myhost.test.ex
 queued for real transport: local_part = d1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by real router
   envelope to: d1@myhost.test.ex
   transport: real
@@ -619,22 +678,27 @@ routing c1@myhost.test.ex
 --------> ut4 router <--------
 local_part=c1 domain=myhost.test.ex
 checking local_parts
+c1 in local_parts? no (end of list)
 ut4 router skipped: local_parts mismatch
 --------> ut5 router <--------
 local_part=c1 domain=myhost.test.ex
 checking local_parts
+c1 in local_parts? no (end of list)
 ut5 router skipped: local_parts mismatch
 --------> ut6 router <--------
 local_part=c1 domain=myhost.test.ex
 checking local_parts
+c1 in local_parts? no (end of list)
 ut6 router skipped: local_parts mismatch
 --------> ut7 router <--------
 local_part=c1 domain=myhost.test.ex
 checking local_parts
+c1 in local_parts? no (end of list)
 ut7 router skipped: local_parts mismatch
 --------> ut8 router <--------
 local_part=c1 domain=myhost.test.ex
 checking local_parts
+c1 in local_parts? no (end of list)
 ut8 router skipped: local_parts mismatch
 --------> real router <--------
 local_part=c1 domain=myhost.test.ex
@@ -644,7 +708,7 @@ real router called for c1@myhost.test.ex
 queued for real transport: local_part = c1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by real router
   envelope to: c1@myhost.test.ex
   transport: real
@@ -653,26 +717,32 @@ routing b1@myhost.test.ex
 --------> ut3 router <--------
 local_part=b1 domain=myhost.test.ex
 checking local_parts
+b1 in local_parts? no (end of list)
 ut3 router skipped: local_parts mismatch
 --------> ut4 router <--------
 local_part=b1 domain=myhost.test.ex
 checking local_parts
+b1 in local_parts? no (end of list)
 ut4 router skipped: local_parts mismatch
 --------> ut5 router <--------
 local_part=b1 domain=myhost.test.ex
 checking local_parts
+b1 in local_parts? no (end of list)
 ut5 router skipped: local_parts mismatch
 --------> ut6 router <--------
 local_part=b1 domain=myhost.test.ex
 checking local_parts
+b1 in local_parts? no (end of list)
 ut6 router skipped: local_parts mismatch
 --------> ut7 router <--------
 local_part=b1 domain=myhost.test.ex
 checking local_parts
+b1 in local_parts? no (end of list)
 ut7 router skipped: local_parts mismatch
 --------> ut8 router <--------
 local_part=b1 domain=myhost.test.ex
 checking local_parts
+b1 in local_parts? no (end of list)
 ut8 router skipped: local_parts mismatch
 --------> real router <--------
 local_part=b1 domain=myhost.test.ex
@@ -682,7 +752,7 @@ real router called for b1@myhost.test.ex
 queued for real transport: local_part = b1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by real router
   envelope to: b1@myhost.test.ex
   transport: real
@@ -691,30 +761,37 @@ routing a1@myhost.test.ex
 --------> ut2 router <--------
 local_part=a1 domain=myhost.test.ex
 checking local_parts
+a1 in local_parts? no (end of list)
 ut2 router skipped: local_parts mismatch
 --------> ut3 router <--------
 local_part=a1 domain=myhost.test.ex
 checking local_parts
+a1 in local_parts? no (end of list)
 ut3 router skipped: local_parts mismatch
 --------> ut4 router <--------
 local_part=a1 domain=myhost.test.ex
 checking local_parts
+a1 in local_parts? no (end of list)
 ut4 router skipped: local_parts mismatch
 --------> ut5 router <--------
 local_part=a1 domain=myhost.test.ex
 checking local_parts
+a1 in local_parts? no (end of list)
 ut5 router skipped: local_parts mismatch
 --------> ut6 router <--------
 local_part=a1 domain=myhost.test.ex
 checking local_parts
+a1 in local_parts? no (end of list)
 ut6 router skipped: local_parts mismatch
 --------> ut7 router <--------
 local_part=a1 domain=myhost.test.ex
 checking local_parts
+a1 in local_parts? no (end of list)
 ut7 router skipped: local_parts mismatch
 --------> ut8 router <--------
 local_part=a1 domain=myhost.test.ex
 checking local_parts
+a1 in local_parts? no (end of list)
 ut8 router skipped: local_parts mismatch
 --------> real router <--------
 local_part=a1 domain=myhost.test.ex
@@ -724,7 +801,7 @@ real router called for a1@myhost.test.ex
 queued for real transport: local_part = a1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by real router
   envelope to: a1@myhost.test.ex
   transport: real
@@ -755,98 +832,101 @@ After routing:
   Failed addresses:
   Deferred addresses:
     g1@myhost.test.ex
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => a1 <a1@myhost.test.ex> P=<CALLER@myhost.test.ex> R=real T=real
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1238 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => b1 <b1@myhost.test.ex> P=<CALLER@myhost.test.ex> R=real T=real
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => c1 <c1@myhost.test.ex> P=<CALLER@myhost.test.ex> R=real T=real
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1240 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => d1 <d1@myhost.test.ex> P=<CALLER@myhost.test.ex> R=real T=real
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1241 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => d2 <d2@myhost.test.ex> P=<CALLER@myhost.test.ex> R=real T=real
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1242 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => d3 <d3@myhost.test.ex> P=<CALLER@myhost.test.ex> R=real T=real
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1243 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => e1 <e1@myhost.test.ex> P=<CALLER@myhost.test.ex> R=real T=real
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1244 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => f1 <f1@myhost.test.ex> P=<CALLER@myhost.test.ex> R=real T=real
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1245 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => f2 <f2@myhost.test.ex> P=<CALLER@myhost.test.ex> R=real T=real
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1246 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => f3 <f3@myhost.test.ex> P=<CALLER@myhost.test.ex> R=real T=real
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1247 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => a1 <a1@myhost.test.ex> P=<> R=u1 T=ut1
 log writing disabled
-locking TESTSUITE/spool/db/retry.lockfile
 transport error EPIPE ignored
+>>>>>>>>>>>>>>>> Exim pid=p1248 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   ** b1@myhost.test.ex P=<> R=ut2 T=ut2: Child process of ut2 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 log writing disabled
-locking TESTSUITE/spool/db/retry.lockfile
 transport error EPIPE ignored
+>>>>>>>>>>>>>>>> Exim pid=p1249 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   == c1@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 log writing disabled
-locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-ut4.lockfile
+cmdlog: '220:EHLO:220:MAIL:250:RCPT:250:DATA:334:.:250:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1250 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => d1@myhost.test.ex P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 log writing disabled
-locking TESTSUITE/spool/db/retry.lockfile
+cmdlog: '220:EHLO:220:MAIL:250:RCPT:450:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1251 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
-  == d2@myhost.test.ex R=ut4 T=ut4 defer (-44): SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 soft error
+  == d2@myhost.test.ex R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: 450 soft error
 log writing disabled
-locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-ut4.lockfile
+cmdlog: '220:EHLO:220:MAIL:250:RCPT:550:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1252 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
-  ** d3@myhost.test.ex P=<> R=ut4 T=ut4: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+  ** d3@myhost.test.ex P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
 log writing disabled
-locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-ut5.lockfile
+cmdlog: '220:EHLO:220:MAIL:250:RCPT:550:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1253 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
-  ** e1@myhost.test.ex P=<> R=ut5 T=ut5: SMTP error from remote mail server after RCPT TO:<e1@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+  ** e1@myhost.test.ex P=<> R=ut5 T=ut5 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e1@myhost.test.ex>: 550 hard error
 log writing disabled
-locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-ut6.lockfile
+cmdlog: '220:EHLO:220:MAIL:250:RCPT:250:DATA:334:.:250:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1254 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => f1@myhost.test.ex P=<CALLER@myhost.test.ex> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1] C="250 OK"
 log writing disabled
-locking TESTSUITE/spool/db/retry.lockfile
+cmdlog: '220:EHLO:220:MAIL:250:RCPT:450:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1255 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
-  == f2@myhost.test.ex R=ut6 T=ut6 defer (-44): SMTP error from remote mail server after RCPT TO:<f2@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 soft error
+  == f2@myhost.test.ex R=ut6 T=ut6 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f2@myhost.test.ex>: 450 soft error
 log writing disabled
-locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-ut6.lockfile
+cmdlog: '220:EHLO:220:MAIL:250:RCPT:550:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1256 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
-  ** f3@myhost.test.ex P=<CALLER@myhost.test.ex> R=ut6 T=ut6: SMTP error from remote mail server after RCPT TO:<f3@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+  ** f3@myhost.test.ex P=<CALLER@myhost.test.ex> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f3@myhost.test.ex>: 550 hard error
 log writing disabled
-locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   f3@myhost.test.ex <f3@myhost.test.ex>: error ignored
 log writing disabled
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
-  <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
+  <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-locking TESTSUITE/spool/db/retry.lockfile
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@myhost.test.ex
 unique = CALLER@myhost.test.ex
@@ -856,34 +936,42 @@ routing CALLER@myhost.test.ex
 --------> u1 router <--------
 local_part=CALLER domain=myhost.test.ex
 checking local_parts
+CALLER in local_parts? no (end of list)
 u1 router skipped: local_parts mismatch
 --------> ut2 router <--------
 local_part=CALLER domain=myhost.test.ex
 checking local_parts
+CALLER in local_parts? no (end of list)
 ut2 router skipped: local_parts mismatch
 --------> ut3 router <--------
 local_part=CALLER domain=myhost.test.ex
 checking local_parts
+CALLER in local_parts? no (end of list)
 ut3 router skipped: local_parts mismatch
 --------> ut4 router <--------
 local_part=CALLER domain=myhost.test.ex
 checking local_parts
+CALLER in local_parts? no (end of list)
 ut4 router skipped: local_parts mismatch
 --------> ut5 router <--------
 local_part=CALLER domain=myhost.test.ex
 checking local_parts
+CALLER in local_parts? no (end of list)
 ut5 router skipped: local_parts mismatch
 --------> ut6 router <--------
 local_part=CALLER domain=myhost.test.ex
 checking local_parts
+CALLER in local_parts? no (end of list)
 ut6 router skipped: local_parts mismatch
 --------> ut7 router <--------
 local_part=CALLER domain=myhost.test.ex
 checking local_parts
+CALLER in local_parts? no (end of list)
 ut7 router skipped: local_parts mismatch
 --------> ut8 router <--------
 local_part=CALLER domain=myhost.test.ex
 checking local_parts
+CALLER in local_parts? no (end of list)
 ut8 router skipped: local_parts mismatch
 --------> real router <--------
 local_part=CALLER domain=myhost.test.ex
@@ -894,7 +982,7 @@ set transport real
 queued for real transport: local_part = CALLER
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by real router
   envelope to: CALLER@myhost.test.ex
   transport: real
@@ -905,32 +993,33 @@ After routing:
   Remote deliveries:
   Failed addresses:
   Deferred addresses:
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1259 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => CALLER <CALLER@myhost.test.ex> P=<> R=real T=real
-locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1258 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1257 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   d3@myhost.test.ex <d3@myhost.test.ex>: error ignored
 log writing disabled
 LOG: MAIN
   b1@myhost.test.ex <b1@myhost.test.ex>: error ignored
 log writing disabled
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp 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 ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-locking TESTSUITE/spool/db/retry.lockfile
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: h1@myhost.test.ex
 unique = h1@myhost.test.ex
@@ -940,30 +1029,37 @@ routing h1@myhost.test.ex
 --------> u1 router <--------
 local_part=h1 domain=myhost.test.ex
 checking local_parts
+h1 in local_parts? no (end of list)
 u1 router skipped: local_parts mismatch
 --------> ut2 router <--------
 local_part=h1 domain=myhost.test.ex
 checking local_parts
+h1 in local_parts? no (end of list)
 ut2 router skipped: local_parts mismatch
 --------> ut3 router <--------
 local_part=h1 domain=myhost.test.ex
 checking local_parts
+h1 in local_parts? no (end of list)
 ut3 router skipped: local_parts mismatch
 --------> ut4 router <--------
 local_part=h1 domain=myhost.test.ex
 checking local_parts
+h1 in local_parts? no (end of list)
 ut4 router skipped: local_parts mismatch
 --------> ut5 router <--------
 local_part=h1 domain=myhost.test.ex
 checking local_parts
+h1 in local_parts? no (end of list)
 ut5 router skipped: local_parts mismatch
 --------> ut6 router <--------
 local_part=h1 domain=myhost.test.ex
 checking local_parts
+h1 in local_parts? no (end of list)
 ut6 router skipped: local_parts mismatch
 --------> ut7 router <--------
 local_part=h1 domain=myhost.test.ex
 checking local_parts
+h1 in local_parts? no (end of list)
 ut7 router skipped: local_parts mismatch
 --------> ut8 router <--------
 local_part=h1 domain=myhost.test.ex
@@ -976,12 +1072,11 @@ set transport ut1
 queued for ut1 transport: local_part = h1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=^h\d
 routed by ut8 router (unseen)
   envelope to: h1@myhost.test.ex
   transport: ut1
 "unseen" set: replicated h1@myhost.test.ex
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: h1@myhost.test.ex
 unique = \0\h1@myhost.test.ex
@@ -997,7 +1092,7 @@ set transport real
 queued for real transport: local_part = h1
 domain = myhost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by real router
   envelope to: h1@myhost.test.ex
   transport: real
@@ -1009,15 +1104,14 @@ After routing:
   Remote deliveries:
   Failed addresses:
   Deferred addresses:
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1262 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => h1 <h1@myhost.test.ex> P=<CALLER@myhost.test.ex> R=real T=real
-locking TESTSUITE/spool/db/retry.lockfile
+>>>>>>>>>>>>>>>> Exim pid=p1263 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => h1 <h1@myhost.test.ex> P=<CALLER@myhost.test.ex> R=ut8 T=ut1
 log writing disabled
-locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1261 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1260 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Master Exim source repository