DANE: Fix 2-rcpt message, diff domins case. Bug 2265

[exim.git] / test / stderr / 0037

diff --git a/test/stderr/0037 b/test/stderr/0037
index 22ee0d210520d0a395016cac3d5ee1e6553ccd04..35555aa700b830e07f0127d825a7267fc1a1072b 100644 (file)
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -2,26 +2,15 @@ Exim version x.yz ....
 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 ....
 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
@@ -50,12 +39,13 @@ 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=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
 rda_interpret: subprocess yield=0 error=NULL
 userfilter router generated userx@test.ex
   errors_to=NULL transport=NULL
@@ -100,7 +90,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
@@ -116,5 +106,5 @@ 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=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>