Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0037

diff --git a/test/stderr/0037 b/test/stderr/0037
index 22ee0d210520d0a395016cac3d5ee1e6553ccd04..a3035c5c70e290c4a2f49c82b14482845582e513 100644 (file)
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -1,32 +1,22 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: check_vars propagating DSN
-DSN: fail_read_filter propagating DSN
-DSN: prepend_filter propagating DSN
-DSN: userfilter propagating DSN
-DSN: user_accept1 propagating DSN
-DSN: user_accept2 propagating DSN
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: check_vars propagating DSN
-DSN: fail_read_filter propagating DSN
-DSN: prepend_filter propagating DSN
-DSN: userfilter propagating DSN
-DSN: user_accept1 propagating DSN
-DSN: user_accept2 propagating DSN
-rda_interpret (file): TESTSUITE/aux-var/0037.F
-expanded: TESTSUITE/aux-var/0037.F
+dropping to exim gid; retaining priv uid
+rda_interpret (file): 'TESTSUITE/aux-var/0037.F'
+expanded: 'TESTSUITE/aux-var/0037.F'
 ssss bytes read from TESTSUITE/aux-var/0037.F
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: filter-userx@test.ex
 unique = filter-userx@test.ex
@@ -36,26 +26,30 @@ routing filter-userx@test.ex
 --------> check_vars router <--------
 local_part=filter-userx domain=test.ex
 checking local_parts
+filter-userx in local_parts? no (end of list)
 check_vars router skipped: local_parts mismatch
 --------> fail_read_filter router <--------
 local_part=filter-userx domain=test.ex
 checking local_parts
+filter-userx in local_parts? no (end of list)
 fail_read_filter router skipped: local_parts mismatch
 --------> prepend_filter router <--------
 local_part=filter-userx domain=test.ex
 checking local_parts
+filter-userx in local_parts? no (end of list)
 prepend_filter router skipped: local_parts mismatch
 --------> userfilter router <--------
 local_part=filter-userx domain=test.ex
 checking local_parts
 $home = >/usr<
 calling userfilter router
-rda_interpret (file): TESTSUITE/aux-var/0037.f-user
-expanded: TESTSUITE/aux-var/0037.f-user
+rda_interpret (file): 'TESTSUITE/aux-var/0037.f-user'
+expanded: 'TESTSUITE/aux-var/0037.f-user'
 ssss bytes read from TESTSUITE/aux-var/0037.f-user
 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
 userfilter router generated userx@test.ex
   errors_to=NULL transport=NULL
@@ -63,7 +57,6 @@ userfilter router generated userx@test.ex
 routed by userfilter router
   envelope to: filter-userx@test.ex
   transport: <none>
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 unique = userx@test.ex
@@ -73,22 +66,27 @@ routing userx@test.ex
 --------> check_vars router <--------
 local_part=userx domain=test.ex
 checking local_parts
+userx in local_parts? no (end of list)
 check_vars router skipped: local_parts mismatch
 --------> fail_read_filter router <--------
 local_part=userx domain=test.ex
 checking local_parts
+userx in local_parts? no (end of list)
 fail_read_filter router skipped: local_parts mismatch
 --------> prepend_filter router <--------
 local_part=userx domain=test.ex
 checking local_parts
+userx in local_parts? no (end of list)
 prepend_filter router skipped: local_parts mismatch
 --------> userfilter router <--------
 local_part=userx domain=test.ex
 checking local_parts
+userx in local_parts? no (end of list)
 userfilter router skipped: local_parts mismatch
 --------> user_accept1 router <--------
 local_part=userx domain=test.ex
 checking local_parts
+userx in local_parts? no (end of list)
 user_accept1 router skipped: local_parts mismatch
 --------> user_accept2 router <--------
 local_part=userx domain=test.ex
@@ -100,7 +98,7 @@ set transport appendfile
 queued for appendfile transport: local_part = userx
 domain = test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=userx
 routed by user_accept2 router
   envelope to: userx@test.ex
   transport: appendfile
@@ -111,10 +109,9 @@ After routing:
   Remote deliveries:
   Failed addresses:
   Deferred addresses:
-locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => userx <filter-userx@test.ex> R=user_accept2 T=appendfile
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>