diff options
45 files changed, 189 insertions, 194 deletions
diff --git a/test/stderr/0037 b/test/stderr/0037 index a300abbe6..8a1a1ce17 100644 --- a/test/stderr/0037 +++ b/test/stderr/0037 @@ -44,12 +44,12 @@ calling userfilter router rda_interpret (file): 'TESTSUITE/aux-var/0037.f-user' expanded: 'TESTSUITE/aux-var/0037.f-user' local-accept-delivery forking for router-interpret -local-accept-delivery forked for router-interpret: npppp 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 >>>>>>>>>>>>>>>> +local-accept-delivery forked for router-interpret: npppp rda_interpret: subprocess yield=0 error=NULL userfilter router generated userx@test.ex errors_to=NULL transport=NULL diff --git a/test/stderr/0143 b/test/stderr/0143 index 07fd508db..ce2eaf752 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -15,7 +15,6 @@ router_name <my_main_router> >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userx@domain.com <-------- local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp transport_name <my_smtp> my_smtp transport entered userx@domain.com @@ -55,6 +54,7 @@ no messages waiting for 127.0.0.1 SMTP>> QUIT cmd buf flush ddd bytes SMTP(close)>> +local-accept-delivery forked for transport: npppp Leaving my_smtp transport LOG: MAIN => userx@domain.com R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK" diff --git a/test/stderr/0169 b/test/stderr/0169 index 40297679c..99eeb54ca 100644 --- a/test/stderr/0169 +++ b/test/stderr/0169 @@ -13,7 +13,6 @@ dropping to exim gid; retaining priv uid >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@myhost.test.ex <-------- local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=52428800 warning=41% file=TESTSUITE/test-mail/userx format=unix @@ -34,6 +33,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 quota = 52428800 threshold = 21495808 old size = sssss message size = sss appendfile yields 0 with errno=dd more_errno=dd +local-accept-delivery forked for delivery-local: npppp appendfile transport returned OK for userx@myhost.test.ex added retry item for T:userx@myhost.test.ex: errno=dd more_errno=dd flags=1 LOG: MAIN diff --git a/test/stderr/0218 b/test/stderr/0218 index bbf2b52b9..1e63d0288 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -8,29 +8,27 @@ LOG: queue_run MAIN queue running combined directories looking in TESTSUITE/spool//input fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp delivering 10HmaX-0005vi-00 (queue run pid ppppp) R: client (ACL) qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp delivering 10HmaY-0005vi-00 (queue run pid ppppp) R: client (ACL) qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp delivering 10HmaX-0005vi-00 (queue run pid ppppp) R: client (ACL) qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready @@ -46,8 +44,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> writing message and terminating "." SMTP<< 250 OK transport forking for continued-transport-interproc -transport forked for continued-transport-interproc: npppp continued-transport-interproc forking for continued-transport +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp +transport forked for continued-transport-interproc: npppp continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN @@ -63,11 +63,11 @@ dropping to exim gid; retaining priv uid delivering 10HmaY-0005vi-00 (queue run pid ppppp) R: client (ACL) continued-transport forking for transport -continued-transport forked for transport: npppp T: send_to_server (ACL) SMTP>> MAIL FROM:<CALLER@test.ex> SMTP>> RCPT TO:<b@test.ex> SMTP>> DATA +continued-transport forked for transport: npppp SMTP<< 250 OK SMTP<< 250 OK SMTP<< 351 Send more @@ -93,29 +93,27 @@ LOG: queue_run MAIN queue running combined directories looking in TESTSUITE/spool//input fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp delivering 10HmaZ-0005vi-00 (queue run pid ppppp) R: client (ACL) qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp delivering 10HmbA-0005vi-00 (queue run pid ppppp) R: client (ACL) qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp delivering 10HmaZ-0005vi-00 (queue run pid ppppp) R: client (ACL) qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready @@ -130,6 +128,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 503 Unexpected DATA SMTP>> QUIT SMTP(close)>> +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp LOG: MAIN ** a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@test.ex>: 550 NO qrun-delivery forking for bounce-message @@ -145,15 +145,15 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp delivering 10HmbA-0005vi-00 (queue run pid ppppp) R: client (ACL) qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp LOG: MAIN == b@test.ex R=client T=send_to_server defer (dd): Connection refused >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -167,15 +167,14 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qqf fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp delivering 10HmbA-0005vi-00 (queue run pid ppppp) R: client (ACL) qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp delivering 10HmbB-0005vi-00 (queue run pid ppppp) R: bounce (ACL) LOG: MAIN @@ -185,20 +184,19 @@ LOG: MAIN LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -fresh-exec forking for qrun-delivery fresh-exec forked for qrun-delivery: npppp +fresh-exec forking for qrun-delivery delivering 10HmbC-0005vi-00 (queue run pid ppppp) R: client (ACL) qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp delivering 10HmbA-0005vi-00 (queue run pid ppppp) R: client (ACL) qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready @@ -214,8 +212,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RSET SMTP<< 250 OK transport forking for continued-transport-interproc -transport forked for continued-transport-interproc: npppp continued-transport-interproc forking for continued-transport +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp +transport forked for continued-transport-interproc: npppp continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN @@ -240,11 +240,11 @@ dropping to exim gid; retaining priv uid delivering 10HmbC-0005vi-00 (queue run pid ppppp) R: client (ACL) continued-transport forking for transport -continued-transport forked for transport: npppp T: send_to_server (ACL) SMTP>> MAIL FROM:<CALLER@test.ex> SMTP>> RCPT TO:<c@test.ex> SMTP>> DATA +continued-transport forked for transport: npppp SMTP<< 250 OK SMTP<< 250 OK SMTP<< 351 OK diff --git a/test/stderr/0275 b/test/stderr/0275 index 965fc8c6a..3f145e26a 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -145,8 +145,8 @@ LOG: MAIN created log directory TESTSUITE/spool/log search_tidyup called fresh-exec forking for local-accept-delivery -fresh-exec forked for local-accept-delivery: npppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +fresh-exec forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -289,7 +289,6 @@ search_tidyup called no retry data available search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=NULL current=/ @@ -302,6 +301,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0 maildir_use_size_file=no locking by lockfile fcntl search_tidyup called +local-accept-delivery forked for delivery-local: npppp journalling userx@test.ex t1 transport returned OK for userx@test.ex post-process userx@test.ex (0) diff --git a/test/stderr/0278 b/test/stderr/0278 index 58fb5e3fc..787af9cf0 100644 --- a/test/stderr/0278 +++ b/test/stderr/0278 @@ -104,8 +104,8 @@ LOG: MAIN created log directory TESTSUITE/spool/log search_tidyup called fresh-exec forking for local-accept-delivery -fresh-exec forked for local-accept-delivery: npppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +fresh-exec forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -203,7 +203,6 @@ search_tidyup called no retry data available search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to CALLER <CALLER@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=CALLER_HOME current=CALLER_HOME @@ -216,6 +215,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0 maildir_use_size_file=no locking by lockfile fcntl search_tidyup called +local-accept-delivery forked for delivery-local: npppp journalling CALLER@test.ex t1 transport returned OK for CALLER@test.ex post-process CALLER@test.ex (0) diff --git a/test/stderr/0283 b/test/stderr/0283 index 9f8da0855..24d01b20b 100644 --- a/test/stderr/0283 +++ b/test/stderr/0283 @@ -30,10 +30,10 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "root": cache not available getpwnam() succeeded uid=uuuu gid=gggg local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to somebody <somebody@myhost.test.ex> transport=t1 uid=EXIM_UID gid=EXIM_GID pid=pppp 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 @@ -76,9 +76,9 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "root": cache not available getpwnam() succeeded uid=uuuu gid=gggg local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to CALLER <CALLER@myhost.test.ex> transport=t2 uid=CALLER_UID gid=CALLER_GID pid=pppp +local-accept-delivery forked for delivery-local: npppp LOG: MAIN => CALLER <CALLER@myhost.test.ex> R=caller T=t2 changed uid/gid: post-delivery tidying diff --git a/test/stderr/0315 b/test/stderr/0315 index b5e05ee23..155fb4dd0 100644 --- a/test/stderr/0315 +++ b/test/stderr/0315 @@ -51,8 +51,8 @@ After routing: Failed addresses: Deferred addresses: local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile +local-accept-delivery forked for transport: npppp LOG: MAIN *> x@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option" LOG: MAIN @@ -132,8 +132,8 @@ After routing: Failed addresses: Deferred addresses: local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile +local-accept-delivery forked for transport: npppp LOG: MAIN *> x@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option" LOG: MAIN diff --git a/test/stderr/0332 b/test/stderr/0332 index 197af3f37..3b65e311c 100644 --- a/test/stderr/0332 +++ b/test/stderr/0332 @@ -5,7 +5,6 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: ok@no.delay @@ -35,12 +34,13 @@ After routing: Failed addresses: Deferred addresses: qrun-delivery forking for transport -qrun-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-t1.lockfile transport forking for continued-transport-interproc -transport forked for continued-transport-interproc: npppp continued-transport-interproc forking for continued-transport +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp +transport forked for continued-transport-interproc: npppp continued-transport-interproc forked for continued-transport: npppp LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK" @@ -87,14 +87,13 @@ After routing: Deferred addresses: delay@test.again.dns continued-transport forking for transport -continued-transport forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile +continued-transport forked for transport: npppp locking TESTSUITE/spool/db/wait-t1.lockfile LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK" >>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: delay@test.again.dns @@ -109,6 +108,7 @@ After routing: Deferred addresses: delay@test.again.dns >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +fresh-exec forked for qrun-delivery: npppp LOG: queue_run MAIN End queue run: pid=pppp >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0333 b/test/stderr/0333 index 39605663f..f17354ea0 100644 --- a/test/stderr/0333 +++ b/test/stderr/0333 @@ -31,12 +31,12 @@ After routing: Failed addresses: Deferred addresses: fresh-exec forking for transport -fresh-exec forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-t1.lockfile transport forking for continued-transport-interproc -transport forked for continued-transport-interproc: npppp continued-transport-interproc forking for continued-transport +fresh-exec forked for transport: npppp +transport forked for continued-transport-interproc: npppp continued-transport-interproc forked for continued-transport: npppp LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK" @@ -83,8 +83,8 @@ After routing: Deferred addresses: delay@test.again.dns continued-transport forking for transport -continued-transport forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile +continued-transport forked for transport: npppp locking TESTSUITE/spool/db/wait-t1.lockfile LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK" diff --git a/test/stderr/0357 b/test/stderr/0357 index bde398c56..a9aa5159a 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -25,11 +25,11 @@ After routing: Failed addresses: Deferred addresses: local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp checking status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile no retry data available added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0 +local-accept-delivery forked for transport: npppp reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess added retry item LOG: MAIN @@ -55,7 +55,6 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -72,12 +71,13 @@ After routing: Failed addresses: Deferred addresses: qrun-delivery forking for transport -qrun-delivery forked for transport: npppp checking status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile no host retry record no message retry record added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0 +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess existing delete item dropped added retry item @@ -116,7 +116,6 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -133,12 +132,13 @@ After routing: Failed addresses: Deferred addresses: qrun-delivery forking for transport -qrun-delivery forked for transport: npppp checking status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile no host retry record no message retry record added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0 +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess existing delete item dropped added retry item @@ -177,7 +177,6 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -202,6 +201,7 @@ Deferred addresses: userx@test.ex: no retry items end of retry processing >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +fresh-exec forked for qrun-delivery: npppp LOG: queue_run MAIN End queue run: pid=pppp >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0358 b/test/stderr/0358 index 9208e426a..f6762da80 100644 --- a/test/stderr/0358 +++ b/test/stderr/0358 @@ -30,12 +30,12 @@ After routing: Failed addresses: Deferred addresses: local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp checking status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile no retry data available added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0 added retry item for R:usery@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0 +local-accept-delivery forked for transport: npppp reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess added retry item reading retry information for R:usery@test.ex:<CALLER@test.ex> from subprocess @@ -71,7 +71,6 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -96,13 +95,14 @@ After routing: Failed addresses: Deferred addresses: qrun-delivery forking for transport -qrun-delivery forked for transport: npppp checking status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile no host retry record no message retry record added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0 added retry item for R:usery@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0 +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess existing delete item dropped added retry item diff --git a/test/stderr/0360 b/test/stderr/0360 index cad287121..3fd5055a9 100644 --- a/test/stderr/0360 +++ b/test/stderr/0360 @@ -145,8 +145,8 @@ After routing: Deferred addresses: defer@test.ex local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile +local-accept-delivery forked for transport: npppp LOG: MAIN *> unknown@recurse.test.ex.test.ex <cms@test.ex> R=r1 T=t1 H=recurse.test.ex.test.ex [V4NET.99.0.2] C="delivery bypassed by -N option" >>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -158,7 +158,6 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qf fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp locking TESTSUITE/spool/db/retry.lockfile no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -249,6 +248,7 @@ After routing: Deferred addresses: defer@test.ex >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +fresh-exec forked for qrun-delivery: npppp LOG: queue_run MAIN End queue run: pid=pppp -qf >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0361 b/test/stderr/0361 index 475ffcc92..effaf0374 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -51,8 +51,8 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss search_tidyup called fresh-exec forking for local-accept-delivery -fresh-exec forked for local-accept-delivery: npppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaY-0005vi-00 +fresh-exec forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -218,7 +218,6 @@ search_tidyup called no retry data available search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to kilos <kilos@recurse.test.ex.test.ex> transport=t2 uid=CALLER_UID gid=CALLER_GID pid=pppp home=NULL current=/ @@ -232,6 +231,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0 locking by lockfile fcntl *** delivery by t2 transport bypassed by -N option search_tidyup called +local-accept-delivery forked for delivery-local: npppp journalling kilos@recurse.test.ex.test.ex/t2 t2 transport returned OK for kilos@recurse.test.ex.test.ex post-process kilos@recurse.test.ex.test.ex (0) diff --git a/test/stderr/0370 b/test/stderr/0370 index 73504d280..46d65e917 100644 --- a/test/stderr/0370 +++ b/test/stderr/0370 @@ -20,13 +20,13 @@ dropping to exim gid; retaining priv uid >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> |TESTSUITE/bin/iefbr14 <-------- local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to |TESTSUITE/bin/iefbr14 <|TESTSUITE/bin/iefbr14> transport=t1 uid=EXIM_UID gid=CALLER_GID pid=pppp t1 transport entered direct command: argv[0] = 'TESTSUITE/bin/iefbr14' 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 diff --git a/test/stderr/0374 b/test/stderr/0374 index 87c60cf69..7d881dd1d 100644 --- a/test/stderr/0374 +++ b/test/stderr/0374 @@ -375,8 +375,8 @@ LOG: MAIN => a1 <a1@myhost.test.ex> R=u1 T=ut1 locking TESTSUITE/spool/db/retry.lockfile local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp 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 @@ -385,8 +385,8 @@ LOG: MAIN ** b1@myhost.test.ex 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 locking TESTSUITE/spool/db/retry.lockfile local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp 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 @@ -394,20 +394,20 @@ transport error EPIPE ignored 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 local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-ut4.lockfile +local-accept-delivery forked for transport: npppp LOG: MAIN => d1@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK" local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile +local-accept-delivery forked for transport: npppp LOG: MAIN == 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 local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-ut4.lockfile +local-accept-delivery forked for transport: npppp LOG: MAIN ** d3@myhost.test.ex 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 locking TESTSUITE/spool/db/retry.lockfile diff --git a/test/stderr/0375 b/test/stderr/0375 index fb56cbc76..003a67b8a 100644 --- a/test/stderr/0375 +++ b/test/stderr/0375 @@ -816,8 +816,8 @@ LOG: MAIN log writing disabled locking TESTSUITE/spool/db/retry.lockfile local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp 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 @@ -827,8 +827,8 @@ LOG: MAIN log writing disabled locking TESTSUITE/spool/db/retry.lockfile local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp 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 @@ -837,49 +837,49 @@ 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 local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-ut4.lockfile +local-accept-delivery forked for transport: npppp 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 local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile +local-accept-delivery forked for transport: npppp LOG: MAIN == 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 local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-ut4.lockfile +local-accept-delivery forked for transport: npppp LOG: MAIN ** 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 local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-ut5.lockfile +local-accept-delivery forked for transport: npppp LOG: MAIN ** 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 local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-ut6.lockfile +local-accept-delivery forked for transport: npppp 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 local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile +local-accept-delivery forked for transport: npppp LOG: MAIN == 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 local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-ut6.lockfile +local-accept-delivery forked for transport: npppp LOG: MAIN ** 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 diff --git a/test/stderr/0377 b/test/stderr/0377 index 593542c92..b01fcf8e5 100644 --- a/test/stderr/0377 +++ b/test/stderr/0377 @@ -325,7 +325,6 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qf fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: aaaa@myhost.test.ex @@ -562,6 +561,7 @@ aaaa@myhost.test.ex was previously delivered (t1 transport): discarded bbbb@myhost.test.ex was previously delivered (t1 transport): discarded locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +fresh-exec forked for qrun-delivery: npppp LOG: queue_run MAIN End queue run: pid=pppp -qf >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -572,7 +572,6 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qf fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: aaaa@myhost.test.ex @@ -809,6 +808,7 @@ aaaa@myhost.test.ex was previously delivered (t1 transport): discarded bbbb@myhost.test.ex was previously delivered (t1 transport): discarded locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +fresh-exec forked for qrun-delivery: npppp LOG: queue_run MAIN End queue run: pid=pppp -qf >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0378 b/test/stderr/0378 index 332b81b4d..061aea50b 100644 --- a/test/stderr/0378 +++ b/test/stderr/0378 @@ -44,11 +44,11 @@ pipe "/bin/sh -c exit" mail subject autoreply text "This is an autoreply"' (tainted) local-accept-delivery forking for router-interpret -local-accept-delivery forked for router-interpret: npppp 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 @@ -120,8 +120,8 @@ After routing: defer_aaaa@myhost.test.ex locking TESTSUITE/spool/db/retry.lockfile local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp 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 @@ -169,8 +169,8 @@ 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 -local-accept-delivery forked for delivery-local: npppp 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 @@ -192,7 +192,6 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qf fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: aaaa@myhost.test.ex @@ -253,11 +252,12 @@ pipe "/bin/sh -c exit" mail subject autoreply text "This is an autoreply"' (tainted) qrun-delivery forking for router-interpret -qrun-delivery forked for router-interpret: npppp 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 diff --git a/test/stderr/0379 b/test/stderr/0379 index 09087ad05..06eb15c04 100644 --- a/test/stderr/0379 +++ b/test/stderr/0379 @@ -147,7 +147,6 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qf fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: defer@myhost.test.ex @@ -177,6 +176,7 @@ After routing: defer@myhost.test.ex locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +fresh-exec forked for qrun-delivery: npppp LOG: queue_run MAIN End queue run: pid=pppp -qf >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0382 b/test/stderr/0382 index 3640b8f8e..5983fb353 100644 --- a/test/stderr/0382 +++ b/test/stderr/0382 @@ -53,12 +53,12 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qf fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp LOG: MAIN cancelled by timeout_frozen_after LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +fresh-exec forked for qrun-delivery: npppp LOG: queue_run MAIN End queue run: pid=pppp -qf >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0386 b/test/stderr/0386 index cc84e8832..e4dd3bef5 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -244,8 +244,8 @@ LOG: MAIN SMTP>> 250 OK id=10HmaX-0005vi-00 search_tidyup called fresh-exec forking for local-accept-delivery -fresh-exec forked for local-accept-delivery: npppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +fresh-exec forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -320,7 +320,6 @@ search_tidyup called no retry data available search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to 2 <2@b> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=NULL current=/ @@ -343,6 +342,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called +local-accept-delivery forked for delivery-local: npppp journalling 2@b t1 transport returned OK for 2@b post-process 2@b (0) @@ -441,8 +441,8 @@ LOG: MAIN SMTP>> 250 OK id=10HmaY-0005vi-00 search_tidyup called fresh-exec forking for local-accept-delivery -fresh-exec forked for local-accept-delivery: npppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 +fresh-exec forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -516,7 +516,6 @@ search_tidyup called no retry data available search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to 2 <2@b> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=NULL current=/ @@ -539,6 +538,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called +local-accept-delivery forked for delivery-local: npppp journalling 2@b t1 transport returned OK for 2@b post-process 2@b (0) diff --git a/test/stderr/0388 b/test/stderr/0388 index 512f34021..63a03697e 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -71,7 +71,6 @@ After routing: search_tidyup called search_tidyup called fresh-exec forking for transport -fresh-exec forked for transport: npppp changed uid/gid: remote delivery to x@y with transport=smtp uid=EXIM_UID gid=EXIM_GID pid=pppp set_process_info: pppp delivering 10HmaX-0005vi-00 using smtp @@ -103,6 +102,7 @@ added retry item for R:x@y: errno=-44 more_errno=dd,A flags=0 SMTP>> QUIT cmd buf flush ddd bytes SMTP(close)>> +fresh-exec forked for transport: npppp set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for x@y: result OK address match test: subject=*@127.0.0.1 pattern=* 127.0.0.1 in "*"? yes (matched "*") @@ -172,8 +172,8 @@ LOG: MAIN closed hints database and lockfile end of retry processing fresh-exec forking for bounce-message -fresh-exec forked for bounce-message: npppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd bounce-message -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 +fresh-exec forked for bounce-message: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -229,8 +229,8 @@ LOG: MAIN <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss search_tidyup called bounce-message forking for local-accept-delivery -bounce-message forked for local-accept-delivery: npppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 +bounce-message forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp diff --git a/test/stderr/0393 b/test/stderr/0393 index d9c77b13c..0c68b4e83 100644 --- a/test/stderr/0393 +++ b/test/stderr/0393 @@ -14,7 +14,6 @@ dropping to exim gid; retaining priv uid >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp direct command: argv[0] = '/bin/cat' direct command after expansion: @@ -33,13 +32,14 @@ mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx writing data block fd=dddd size=sss timeout=0 delivery-local forking for transport-filter +local-accept-delivery forked for delivery-local: npppp delivery-local forked for transport-filter: npppp process pppp running as transport filter: fd_write=dddd fd_read=dddd delivery-local forking for tpt-filter-writer -delivery-local forked for tpt-filter-writer: npppp cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 >>>>>>>>>>>>>>>> Exim pid=pppp (tpt-filter-writer) terminating with rc=0 >>>>>>>>>>>>>>>> +delivery-local forked for tpt-filter-writer: npppp process pppp writing to transport filter copying from the filter waiting for filter process @@ -70,7 +70,6 @@ dropping to exim gid; retaining priv uid >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp direct command: direct command after expansion: appendfile transport entered @@ -90,6 +89,7 @@ cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd +local-accept-delivery forked for delivery-local: npppp t1 transport returned OK for userx@test.ex LOG: MAIN => userx <userx@test.ex> R=r1 T=t1 @@ -112,7 +112,6 @@ dropping to exim gid; retaining priv uid >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp direct command: argv[0] = '${if={1}{1}{}{}}' direct command after expansion: @@ -134,6 +133,7 @@ cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd +local-accept-delivery forked for delivery-local: npppp t1 transport returned OK for userx@test.ex LOG: MAIN => userx <userx@test.ex> R=r1 T=t1 diff --git a/test/stderr/0402 b/test/stderr/0402 index ccc2b2745..c931d861a 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -175,8 +175,8 @@ LOG: MAIN created log directory TESTSUITE/spool/log search_tidyup called fresh-exec forking for local-accept-delivery -fresh-exec forked for local-accept-delivery: npppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +fresh-exec forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -459,7 +459,6 @@ no retry data available ╰──(tainted) search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=ft1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=/non-exist/usery current=/ @@ -504,6 +503,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called +local-accept-delivery forked for delivery-local: npppp journalling TESTSUITE/test-mail/junk:rd+usery@test.ex ft1 transport returned OK for TESTSUITE/test-mail/junk post-process TESTSUITE/test-mail/junk (0) @@ -520,7 +520,6 @@ LOG: MAIN no retry data available search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=ft1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=/non-exist/CALLER current=/ @@ -565,6 +564,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called +local-accept-delivery forked for delivery-local: npppp journalling TESTSUITE/test-mail/junk:rd+CALLER@test.ex ft1 transport returned OK for TESTSUITE/test-mail/junk post-process TESTSUITE/test-mail/junk (0) @@ -581,7 +581,6 @@ LOG: MAIN no retry data available search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to CALLER <CALLER@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=/non-exist/CALLER current=/ @@ -594,6 +593,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0 maildir_use_size_file=no locking by lockfile fcntl search_tidyup called +local-accept-delivery forked for delivery-local: npppp journalling CALLER@test.ex t1 transport returned OK for CALLER@test.ex post-process CALLER@test.ex (0) @@ -613,7 +613,6 @@ no retry data available ╰──(tainted) search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to usery <usery@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=/non-exist/usery current=/ @@ -626,6 +625,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0 maildir_use_size_file=no locking by lockfile fcntl search_tidyup called +local-accept-delivery forked for delivery-local: npppp journalling usery@test.ex t1 transport returned OK for usery@test.ex post-process usery@test.ex (0) @@ -645,7 +645,6 @@ no retry data available ╰──(tainted) search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to userz <userz@test.ex> transport=t2 uid=CALLER_UID gid=CALLER_GID pid=pppp home=/userz current=/ @@ -658,6 +657,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0 maildir_use_size_file=no locking by lockfile fcntl search_tidyup called +local-accept-delivery forked for delivery-local: npppp journalling userz@test.ex t2 transport returned OK for userz@test.ex post-process userz@test.ex (0) diff --git a/test/stderr/0403 b/test/stderr/0403 index ec8ebde39..2b150c7f2 100644 --- a/test/stderr/0403 +++ b/test/stderr/0403 @@ -45,8 +45,8 @@ LOG: MAIN created log directory TESTSUITE/spool/log search_tidyup called fresh-exec forking for local-accept-delivery -fresh-exec forked for local-accept-delivery: npppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaX-0005vi-00 +fresh-exec forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -163,7 +163,6 @@ search_tidyup called no retry data available search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=/usr current=/usr @@ -182,6 +181,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0 locking by lockfile fcntl *** delivery by t1 transport bypassed by -N option search_tidyup called +local-accept-delivery forked for delivery-local: npppp journalling TESTSUITE/test-mail/junk:userx@test.ex t1 transport returned OK for TESTSUITE/test-mail/junk post-process TESTSUITE/test-mail/junk (0) diff --git a/test/stderr/0404 b/test/stderr/0404 index e417f7792..57349d832 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -144,8 +144,8 @@ LOG: MAIN created log directory TESTSUITE/spool/log search_tidyup called fresh-exec forking for local-accept-delivery -fresh-exec forked for local-accept-delivery: npppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +fresh-exec forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -201,7 +201,6 @@ mail text rhubarb seen finish' search_tidyup called local-accept-delivery forking for router-interpret -local-accept-delivery forked for router-interpret: npppp changed uid/gid: r2 router (recipient is userx@test.ex) uid=CALLER_UID gid=CALLER_GID pid=pppp turned off address rewrite logging (not root or exim in this process) @@ -210,6 +209,7 @@ Filter: start of processing Filter: end of processing search_tidyup called >>>>>>>>>>>>>>>> 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 t1 r2 router generated >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... @@ -247,7 +247,6 @@ search_tidyup called no retry data available search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... <>sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=NULL current=/ @@ -255,8 +254,9 @@ set_process_info: pppp **** string overflowed buffer **** t1 transport entered taking data from address delivery-local forking for autoreply -delivery-local forked for autoreply: npppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd autoreply -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 +local-accept-delivery forked for delivery-local: npppp +delivery-local forked for autoreply: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -1528,8 +1528,8 @@ LOG: MAIN <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss search_tidyup called autoreply forking for local-accept-delivery -autoreply forked for local-accept-delivery: npppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 +autoreply forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -17992,7 +17992,6 @@ sender@test.ex is a duplicate address: discarded no retry data available search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to sender <sender@test.ex> transport=t2 uid=CALLER_UID gid=CALLER_GID pid=pppp home=NULL current=/ @@ -18017,6 +18016,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called +local-accept-delivery forked for delivery-local: npppp journalling sender@test.ex t2 transport returned OK for sender@test.ex post-process sender@test.ex (0) diff --git a/test/stderr/0408 b/test/stderr/0408 index 2891a2ce9..8115b1812 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -45,8 +45,8 @@ LOG: MAIN created log directory TESTSUITE/spool/log search_tidyup called fresh-exec forking for local-accept-delivery -fresh-exec forked for local-accept-delivery: npppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +fresh-exec forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -144,7 +144,6 @@ search_tidyup called no retry data available search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=NULL current=/ @@ -167,6 +166,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called +local-accept-delivery forked for delivery-local: npppp journalling userx@test.ex t1 transport returned OK for userx@test.ex post-process userx@test.ex (0) diff --git a/test/stderr/0426 b/test/stderr/0426 index b776c924c..a76e5c591 100644 --- a/test/stderr/0426 +++ b/test/stderr/0426 @@ -50,9 +50,9 @@ After routing: Failed addresses: Deferred addresses: local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-t1.lockfile +local-accept-delivery forked for transport: npppp LOG: MAIN ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: 550 Unknown local-accept-delivery forking for bounce-message diff --git a/test/stderr/0433 b/test/stderr/0433 index ad13502ba..1baa73a11 100644 --- a/test/stderr/0433 +++ b/test/stderr/0433 @@ -19,8 +19,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -43,8 +43,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -68,8 +68,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -93,8 +93,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -119,8 +119,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -145,7 +145,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0437 b/test/stderr/0437 index 9bb49b0b8..238c4aeed 100644 --- a/test/stderr/0437 +++ b/test/stderr/0437 @@ -17,7 +17,6 @@ LOG: queue_run MAIN Start queue run: pid=pppp search_tidyup called fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp search_open: lsearch "TESTSUITE/aux-fixed/0437.ls" search_find: file="TESTSUITE/aux-fixed/0437.ls" key="transport" partial=-1 affix=NULL starflags=0 @@ -32,7 +31,6 @@ fresh-exec forked for qrun-delivery: npppp search_tidyup called search_tidyup called qrun-delivery forking for delivery-local -qrun-delivery forked for delivery-local: npppp search_open: lsearch "TESTSUITE/aux-fixed/0437.ls" search_find: file="TESTSUITE/aux-fixed/0437.ls" key="file" partial=-1 affix=NULL starflags=0 @@ -45,6 +43,8 @@ qrun-delivery forked for delivery-local: npppp in TESTSUITE/aux-fixed/0437.ls lookup yielded: file search_tidyup called +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for delivery-local: npppp LOG: MAIN => userx <userx@myhost.test.ex> R=r1 T=t1 LOG: MAIN @@ -53,7 +53,6 @@ search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp search_open: lsearch "TESTSUITE/aux-fixed/0437.ls" search_find: file="TESTSUITE/aux-fixed/0437.ls" key="transport" partial=-1 affix=NULL starflags=0 @@ -68,7 +67,6 @@ fresh-exec forked for qrun-delivery: npppp search_tidyup called search_tidyup called qrun-delivery forking for delivery-local -qrun-delivery forked for delivery-local: npppp search_open: lsearch "TESTSUITE/aux-fixed/0437.ls" search_find: file="TESTSUITE/aux-fixed/0437.ls" key="file" partial=-1 affix=NULL starflags=0 @@ -81,6 +79,8 @@ qrun-delivery forked for delivery-local: npppp in TESTSUITE/aux-fixed/0437.ls lookup yielded: file search_tidyup called +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for delivery-local: npppp LOG: MAIN => userx <userx@myhost.test.ex> R=r1 T=t1 LOG: MAIN diff --git a/test/stderr/0438 b/test/stderr/0438 index 0dc65a13a..9f62baa39 100644 --- a/test/stderr/0438 +++ b/test/stderr/0438 @@ -21,8 +21,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -46,8 +46,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.anotherpid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -71,7 +71,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/mypidfile -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0450 b/test/stderr/0450 index d310614c8..de6856473 100644 --- a/test/stderr/0450 +++ b/test/stderr/0450 @@ -14,7 +14,6 @@ dropping to exim gid; retaining priv uid >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp t1 transport entered userx@test.ex using the transport's hosts: 127.0.0.1 @@ -26,6 +25,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused added retry item for T:127.0.0.1:127.0.0.1:1225: errno=dd more_errno=dd,A flags=2 +local-accept-delivery forked for transport: npppp all IP addresses skipped or deferred at least one address updating wait-t1 database added to list for 127.0.0.1 @@ -41,11 +41,9 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- qrun-delivery forking for transport -qrun-delivery forked for transport: npppp t1 transport entered userx@test.ex using the transport's hosts: 127.0.0.1 @@ -59,6 +57,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1226 ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused added retry item for T:127.0.0.1:127.0.0.1:1226: errno=dd more_errno=dd,A flags=2 +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp all IP addresses skipped or deferred at least one address updating wait-t1 database already listed for 127.0.0.1 diff --git a/test/stderr/0476 b/test/stderr/0476 index f89294e8a..3f2451ec3 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -7,13 +7,10 @@ LOG: queue_run MAIN Start queue run: pid=pppp set_process_info: pppp running queue: 10HmaX-0005vi-00-H fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp -set_process_info: pppp running queue: waiting for 10HmaX-0005vi-00 (pppp) set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid ppppp) >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- qrun-delivery forking for transport -qrun-delivery forked for transport: npppp set_process_info: pppp delivering 10HmaX-0005vi-00 using t1 t1 transport entered userx@test.ex @@ -55,6 +52,9 @@ H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for userx@test.ex: result OK Leaving t1 transport set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@test.ex in subprocess) +fresh-exec forked for qrun-delivery: npppp +set_process_info: pppp running queue: waiting for 10HmaX-0005vi-00 (pppp) +qrun-delivery forked for transport: npppp set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish set_process_info: pppp delivering 10HmaX-0005vi-00 LOG: MAIN @@ -83,7 +83,6 @@ set_process_info: pppp delivering 10HmaZ-0005vi-00 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> CALLER@the.local.host.name <-------- local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp set_process_info: pppp delivering 10HmaZ-0005vi-00 using t1 t1 transport entered CALLER@the.local.host.name @@ -98,6 +97,7 @@ LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for CALLER@the.local.host.name: result DEFER added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +local-accept-delivery forked for transport: npppp all IP addresses skipped or deferred at least one address updating wait-t1 database added to list for 127.0.0.1 @@ -117,13 +117,10 @@ set_process_info: pppp running queue: waiting for children of pppp set_process_info: pppp running queue set_process_info: pppp running queue: 10HmaY-0005vi-00-H fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp -set_process_info: pppp running queue: waiting for 10HmaY-0005vi-00 (pppp) set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid ppppp) >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> usery@test.ex <-------- qrun-delivery forking for transport -qrun-delivery forked for transport: npppp set_process_info: pppp delivering 10HmaY-0005vi-00 using t1 t1 transport entered usery@test.ex @@ -137,6 +134,9 @@ updating wait-t1 database added to list for 127.0.0.1 Leaving t1 transport set_process_info: pppp delivering 10HmaY-0005vi-00 (just run t1 for usery@test.ex in subprocess) +fresh-exec forked for qrun-delivery: npppp +set_process_info: pppp running queue: waiting for 10HmaY-0005vi-00 (pppp) +qrun-delivery forked for transport: npppp set_process_info: pppp delivering 10HmaY-0005vi-00: waiting for a remote delivery subprocess to finish set_process_info: pppp delivering 10HmaY-0005vi-00 LOG: retry_defer MAIN diff --git a/test/stderr/0487 b/test/stderr/0487 index 436b343fb..cf4fa55e7 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -72,8 +72,8 @@ created log directory TESTSUITE/spool/log SMTP>> 250 OK id=10HmaX-0005vi-00 search_tidyup called fresh-exec forking for local-accept-delivery -fresh-exec forked for local-accept-delivery: npppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +fresh-exec forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -146,7 +146,6 @@ search_tidyup called no retry data available search_tidyup called local-accept-delivery forking for delivery-local -local-accept-delivery forked for delivery-local: npppp changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=NULL current=/ @@ -171,6 +170,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called +local-accept-delivery forked for delivery-local: npppp journalling userx@test.ex t1 transport returned OK for userx@test.ex post-process userx@test.ex (0) diff --git a/test/stderr/0512 b/test/stderr/0512 index 4161f9761..ce9a15ec7 100644 --- a/test/stderr/0512 +++ b/test/stderr/0512 @@ -5,11 +5,9 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qf fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userx@myhost.test.ex <-------- qrun-delivery forking for transport -qrun-delivery forked for transport: npppp t1 transport entered userx@myhost.test.ex using the transport's hosts: 127.0.0.1 : 127.0.0.1 : 127.0.0.1 : 127.0.0.1 @@ -24,6 +22,8 @@ LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 temporary delivery error(s) override hosts_max_try (message older than host's retry time) +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp getting address for 127.0.0.1 checking status of 127.0.0.1 no message retry record @@ -101,11 +101,9 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qf fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userx@myhost.test.ex <-------- qrun-delivery forking for transport -qrun-delivery forked for transport: npppp t1 transport entered userx@myhost.test.ex using the transport's hosts: 127.0.0.1 : 127.0.0.1 : 127.0.0.1 : 127.0.0.1 @@ -120,6 +118,8 @@ LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 temporary delivery error(s) override hosts_max_try (message older than host's retry time) +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp getting address for 127.0.0.1 checking status of 127.0.0.1 no message retry record diff --git a/test/stderr/0529 b/test/stderr/0529 index 24b48baeb..21961e6cc 100644 --- a/test/stderr/0529 +++ b/test/stderr/0529 @@ -58,7 +58,6 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: x@test.ex @@ -91,6 +90,7 @@ Deferred addresses: x@test.ex: no retry items end of retry processing >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +fresh-exec forked for qrun-delivery: npppp LOG: queue_run MAIN End queue run: pid=pppp >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0543 b/test/stderr/0543 index 72a6d44a2..dd7000398 100644 --- a/test/stderr/0543 +++ b/test/stderr/0543 @@ -5,7 +5,6 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@domain1 @@ -34,6 +33,7 @@ After routing: Failed addresses: Deferred addresses: qrun-delivery forking for transport +fresh-exec forked for qrun-delivery: npppp qrun-delivery forked for transport: npppp locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-smtp.lockfile @@ -43,7 +43,6 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: usery@domain1 @@ -58,6 +57,7 @@ After routing: Deferred addresses: usery@domain1 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +fresh-exec forked for qrun-delivery: npppp LOG: queue_run MAIN End queue run: pid=pppp >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0544 b/test/stderr/0544 index 66da14d3c..75ee48192 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -128,11 +128,11 @@ trusted user admin user dropping to exim gid; retaining priv uid local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp ╭considering: $domain ├──expanding: $domain ╰─────result: domain1.ex ╰──(tainted) +local-accept-delivery forked for transport: npppp LOG: MAIN == userx@domain1.ex R=smarthost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue LOG: MAIN diff --git a/test/stderr/0554 b/test/stderr/0554 index 8e91438d5..ff6b6c8ad 100644 --- a/test/stderr/0554 +++ b/test/stderr/0554 @@ -16,11 +16,11 @@ After routing: Failed addresses: Deferred addresses: fresh-exec forking for transport -fresh-exec forked for transport: npppp checking status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile no retry data available added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=-44 more_errno=dd,A flags=0 +fresh-exec forked for transport: npppp reading retry information for R:x@y:<CALLER@myhost.test.ex> from subprocess added retry item LOG: MAIN @@ -58,7 +58,6 @@ After routing: Failed addresses: Deferred addresses: fresh-exec forking for transport -fresh-exec forked for transport: npppp checking status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile no host retry record @@ -66,6 +65,7 @@ no message retry record added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=dd more_errno=dd,A flags=1 added retry item for R:x@y: errno=dd more_errno=dd,A flags=1 locking TESTSUITE/spool/db/wait-smtp.lockfile +fresh-exec forked for transport: npppp reading retry information for R:x@y from subprocess existing delete item dropped added delete item diff --git a/test/stderr/0609 b/test/stderr/0609 index a6027e8e7..d4f11343b 100644 --- a/test/stderr/0609 +++ b/test/stderr/0609 @@ -18,15 +18,15 @@ ppppp Connection request from 127.0.0.1 port sssss ppppp LOG: smtp_connection MAIN ppppp SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) ppppp daemon forking for daemon-accept -ppppp daemon forked for daemon-accept: npppp -ppppp 1 SMTP accept process running -ppppp Listening... ppppp Process ppppp is handling incoming connection from [127.0.0.1] ppppp Process ppppp is ready for new message ppppp using ACL "delay4_accept" ppppp processing "accept" (TESTSUITE/test-config 24) ppppp check delay = 4s ppppp delay modifier requests 4-second delay +ppppp daemon forked for daemon-accept: npppp +ppppp 1 SMTP accept process running +ppppp Listening... ppppp accept: condition test succeeded in ACL "delay4_accept" ppppp end of ACL "delay4_accept": ACCEPT ppppp LOG: smtp_connection MAIN @@ -40,9 +40,6 @@ ppppp Connection request from 127.0.0.1 port sssss ppppp LOG: smtp_connection MAIN ppppp SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) ppppp daemon forking for daemon-accept -ppppp daemon forked for daemon-accept: npppp -ppppp 1 SMTP accept process running -ppppp Listening... ppppp Process ppppp is handling incoming connection from [127.0.0.1] ppppp Process ppppp is ready for new message ppppp using ACL "delay4_accept" @@ -55,10 +52,8 @@ ppppp end of ACL "delay4_accept": ACCEPT ppppp LOG: lost_incoming_connection MAIN ppppp unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>> -ppppp child ppppp ended: status=0x100 -ppppp normal exit, 1 -ppppp 0 SMTP accept processes now running -ppppp Listening... +ppppp daemon forked for daemon-accept: npppp +ppppp 1 SMTP accept process running ppppp daemon forking for daemon-del-pidfile ppppp daemon forked for daemon-del-pidfile: npppp ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/1007 b/test/stderr/1007 index 5bd20c216..27489e90d 100644 --- a/test/stderr/1007 +++ b/test/stderr/1007 @@ -20,8 +20,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -46,8 +46,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -73,8 +73,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -100,8 +100,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 ; ::0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -124,8 +124,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [ip6:i daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -151,8 +151,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -179,8 +179,8 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -206,7 +206,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... daemon forking for daemon-del-pidfile -daemon forked for daemon-del-pidfile: npppp pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +daemon forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2013 b/test/stderr/2013 index 070012d11..cbd7ee755 100644 --- a/test/stderr/2013 +++ b/test/stderr/2013 @@ -5,28 +5,28 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qqf fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp qrun-delivery forking for transport +fresh-exec forked for qrun-delivery: npppp qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp qrun-delivery forking for transport +fresh-exec forked for qrun-delivery: npppp qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp qrun-delivery forking for transport +fresh-exec forked for qrun-delivery: npppp qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp qrun-delivery forking for transport -qrun-delivery forked for transport: npppp Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -52,12 +52,12 @@ cmd buf flush ddd bytes SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbA-0005vi-00 transport forking for continued-transport-interproc -transport forked for continued-transport-interproc: npppp continued-transport-interproc forking for continued-transport +transport forked for continued-transport-interproc: npppp continued-transport-interproc forked for continued-transport: npppp transport forking for tls-proxy-interproc -transport forked for tls-proxy-interproc: npppp tls-proxy-interproc forking for tls-proxy +transport forked for tls-proxy-interproc: npppp tls-proxy-interproc forked for tls-proxy: npppp LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" @@ -70,7 +70,6 @@ trusted user admin user dropping to exim gid; retaining priv uid continued-transport forking for transport -continued-transport forked for transport: npppp SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss SMTP>> RCPT TO:<userz@test.ex> SMTP>> DATA @@ -80,8 +79,9 @@ cmd buf flush ddd bytes SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbB-0005vi-00 transport forking for continued-transport-interproc -transport forked for continued-transport-interproc: npppp continued-transport-interproc forking for continued-transport +continued-transport forked for transport: npppp +transport forked for continued-transport-interproc: npppp continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN @@ -95,7 +95,6 @@ trusted user admin user dropping to exim gid; retaining priv uid continued-transport forking for transport -continued-transport forked for transport: npppp SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss SMTP>> RCPT TO:<usery@test.ex> SMTP>> DATA @@ -107,6 +106,7 @@ cmd buf flush ddd bytes SMTP>> QUIT cmd buf flush ddd bytes SMTP(close)>> +continued-transport forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00" @@ -123,28 +123,28 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qqf fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp qrun-delivery forking for transport +fresh-exec forked for qrun-delivery: npppp qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp qrun-delivery forking for transport +fresh-exec forked for qrun-delivery: npppp qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp qrun-delivery forking for transport +fresh-exec forked for qrun-delivery: npppp qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp qrun-delivery forking for transport -qrun-delivery forked for transport: npppp Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -170,12 +170,12 @@ cmd buf flush ddd bytes SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbG-0005vi-00 transport forking for continued-transport-interproc -transport forked for continued-transport-interproc: npppp continued-transport-interproc forking for continued-transport +transport forked for continued-transport-interproc: npppp continued-transport-interproc forked for continued-transport: npppp transport forking for tls-proxy-interproc -transport forked for tls-proxy-interproc: npppp tls-proxy-interproc forking for tls-proxy +transport forked for tls-proxy-interproc: npppp tls-proxy-interproc forked for tls-proxy: npppp LOG: MAIN => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00" @@ -188,7 +188,6 @@ trusted user admin user dropping to exim gid; retaining priv uid continued-transport forking for transport -continued-transport forked for transport: npppp SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss SMTP>> RCPT TO:<userc@test.ex> SMTP>> DATA @@ -198,8 +197,9 @@ cmd buf flush ddd bytes SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbH-0005vi-00 transport forking for continued-transport-interproc -transport forked for continued-transport-interproc: npppp continued-transport-interproc forking for continued-transport +continued-transport forked for transport: npppp +transport forked for continued-transport-interproc: npppp continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN @@ -213,7 +213,6 @@ trusted user admin user dropping to exim gid; retaining priv uid continued-transport forking for transport -continued-transport forked for transport: npppp SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss SMTP>> RCPT TO:<userb@test.ex> SMTP>> DATA @@ -225,6 +224,7 @@ cmd buf flush ddd bytes SMTP>> QUIT cmd buf flush ddd bytes SMTP(close)>> +continued-transport forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00" @@ -241,28 +241,28 @@ dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qqf fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp qrun-delivery forking for transport +fresh-exec forked for qrun-delivery: npppp qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp qrun-delivery forking for transport +fresh-exec forked for qrun-delivery: npppp qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp qrun-delivery forking for transport +fresh-exec forked for qrun-delivery: npppp qrun-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp qrun-delivery forking for transport -qrun-delivery forked for transport: npppp Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes +fresh-exec forked for qrun-delivery: npppp +qrun-delivery forked for transport: npppp SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -296,8 +296,8 @@ cmd buf flush ddd bytes 250-STARTTLS 250 HELP transport forking for continued-transport-interproc -transport forked for continued-transport-interproc: npppp continued-transport-interproc forking for continued-transport +transport forked for continued-transport-interproc: npppp continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN @@ -311,9 +311,9 @@ trusted user admin user dropping to exim gid; retaining priv uid continued-transport forking for transport -continued-transport forked for transport: npppp SMTP>> STARTTLS cmd buf flush ddd bytes +continued-transport forked for transport: npppp SMTP<< 220 TLS go ahead SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -339,8 +339,8 @@ cmd buf flush ddd bytes 250-STARTTLS 250 HELP transport forking for continued-transport-interproc -transport forked for continued-transport-interproc: npppp continued-transport-interproc forking for continued-transport +transport forked for continued-transport-interproc: npppp continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN @@ -354,9 +354,9 @@ trusted user admin user dropping to exim gid; retaining priv uid continued-transport forking for transport -continued-transport forked for transport: npppp SMTP>> STARTTLS cmd buf flush ddd bytes +continued-transport forked for transport: npppp SMTP<< 220 TLS go ahead SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes diff --git a/test/stderr/2035 b/test/stderr/2035 index 2ea5ca578..b836e5e5a 100644 --- a/test/stderr/2035 +++ b/test/stderr/2035 @@ -41,8 +41,8 @@ LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> local-accept-delivery forking for tls-proxy-interproc -local-accept-delivery forked for tls-proxy-interproc: npppp tls-proxy-interproc forking for tls-proxy +local-accept-delivery forked for tls-proxy-interproc: npppp tls-proxy-interproc forked for tls-proxy: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -52,7 +52,6 @@ dropping to exim gid; retaining priv uid >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userb@test.ex <-------- local-accept-delivery forking for transport -local-accept-delivery forked for transport: npppp t1 transport entered userb@test.ex hostlist: @@ -75,6 +74,7 @@ ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL SMTP>> QUIT cmd buf flush ddd bytes SMTP(close)>> +local-accept-delivery forked for transport: npppp >>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> Leaving t1 transport LOG: MAIN diff --git a/test/stdout/0601 b/test/stdout/0601 index 85107ba74..3c2710ecf 100644 --- a/test/stdout/0601 +++ b/test/stdout/0601 @@ -1,7 +1,7 @@ 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-received: message from exim 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaX-0005vi-00
221 the.local.host.name closing connection
+received: message from exim |