Taint: enforce untainted ACL text line

[exim.git] / test / stderr / 0037

diff --git a/test/stderr/0037 b/test/stderr/0037
index 7a3b56c2c45446d617cfb645c65c036c7255b0a3..35555aa700b830e07f0127d825a7267fc1a1072b 100644 (file)
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -4,9 +4,6 @@ trusted user
 admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 admin user
 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 ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -44,14 +41,11 @@ $home = >/usr<
 calling userfilter router
 rda_interpret (file): 'TESTSUITE/aux-var/0037.f-user'
 expanded: 'TESTSUITE/aux-var/0037.f-user'
 calling userfilter router
 rda_interpret (file): 'TESTSUITE/aux-var/0037.f-user'
 expanded: 'TESTSUITE/aux-var/0037.f-user'

-fresh-exec forking for router interpret
-postfork: router interpret

 ssss bytes read from TESTSUITE/aux-var/0037.f-user
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
 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 (rda) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for router interpret: npppp
+>>>>>>>>>>>>>>>> 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
 rda_interpret: subprocess yield=0 error=NULL
 userfilter router generated userx@test.ex
   errors_to=NULL transport=NULL


@@ -96,7 +90,7 @@ set transport appendfile
 queued for appendfile transport: local_part = userx
 domain = test.ex
   errors_to=NULL
 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
 routed by user_accept2 router
   envelope to: userx@test.ex
   transport: appendfile


@@ -108,12 +102,9 @@ After routing:
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile

-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp

 LOG: MAIN
   => userx <filter-userx@test.ex> R=user_accept2 T=appendfile
 LOG: MAIN
   Completed
 LOG: MAIN
   => userx <filter-userx@test.ex> R=user_accept2 T=appendfile
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>