Fix $local_part_verified for remote-delivery routing following local. Bug 2565

[users/heiko/exim.git] / test / stderr / 0378

diff --git a/test/stderr/0378 b/test/stderr/0378
index 061aea50bc85b20d9fafd2439eaffb3b98951d13..a3a48dcff5d42af74b2783194c9078dcc243041e 100644 (file)
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log

-fresh-exec forking for 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


@@ -43,12 +41,10 @@ save TESTSUITE/test-mail/file
 pipe "/bin/sh -c exit"
 mail subject autoreply
 text "This is an autoreply"' (tainted)
 pipe "/bin/sh -c exit"
 mail subject autoreply
 text "This is an autoreply"' (tainted)

-local-accept-delivery forking for router-interpret

 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
 >>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
 >>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>

-local-accept-delivery forked for router-interpret: npppp

 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@myhost.test.ex
 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@myhost.test.ex


@@ -119,17 +115,11 @@ After routing:
   Deferred addresses:
     defer_aaaa@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
   Deferred addresses:
     defer_aaaa@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile

-local-accept-delivery forking for delivery-local
-delivery-local forking for autoreply
-local-accept-delivery forked for delivery-local: npppp
-delivery-local forked for autoreply: npppp

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss

-autoreply forking for local-accept-delivery
-autoreply 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


@@ -168,18 +158,10 @@ LOG: MAIN
 LOG: MAIN
   => >CALLER@myhost.test.ex <aaaa@myhost.test.ex> R=aaaa T=t3
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => >CALLER@myhost.test.ex <aaaa@myhost.test.ex> R=aaaa T=t3
 locking TESTSUITE/spool/db/retry.lockfile

-local-accept-delivery forking for delivery-local
-delivery-local forking for pipe-tpt-cmd
-local-accept-delivery forked for delivery-local: npppp
-delivery-local forked for pipe-tpt-cmd: npppp
-delivery-local forking for pipe-tpt-output
-delivery-local forked for pipe-tpt-output: npppp

 transport error EPIPE ignored
 LOG: MAIN
   => |/bin/sh -c exit <aaaa@myhost.test.ex> R=aaaa T=t2
 locking TESTSUITE/spool/db/retry.lockfile
 transport error EPIPE ignored
 LOG: MAIN
   => |/bin/sh -c exit <aaaa@myhost.test.ex> R=aaaa T=t2
 locking TESTSUITE/spool/db/retry.lockfile

-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp

 LOG: MAIN
   => TESTSUITE/test-mail/file <aaaa@myhost.test.ex> R=aaaa T=t1
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => TESTSUITE/test-mail/file <aaaa@myhost.test.ex> R=aaaa T=t1
 locking TESTSUITE/spool/db/retry.lockfile


@@ -191,7 +173,6 @@ admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf

-fresh-exec forking for qrun-delivery

 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex


@@ -251,13 +232,10 @@ save TESTSUITE/test-mail/file
 pipe "/bin/sh -c exit"
 mail subject autoreply
 text "This is an autoreply"' (tainted)
 pipe "/bin/sh -c exit"
 mail subject autoreply
 text "This is an autoreply"' (tainted)

-qrun-delivery forking for router-interpret

 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
 >>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
 >>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>

-fresh-exec forked for qrun-delivery: npppp
-qrun-delivery forked for router-interpret: npppp

 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@myhost.test.ex
 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@myhost.test.ex