X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/32393657bff79d9925ec865aebb066c9409c4e27..c9771b0f607127d89018dd79bab6febb14db3d6d:/test/stderr/0218 diff --git a/test/stderr/0218 b/test/stderr/0218 index af919d5cd..acfb3c156 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -7,57 +7,35 @@ LOG: queue_run MAIN Start queue run: pid=pppp -qq queue running combined directories looking in TESTSUITE/spool//input -fresh-exec forking for qrun delivery -postfork: qrun delivery -delivering 10HmaX-0005vi-00 (queue run pid ppppp) +delivering 10HmaX-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun delivery forking for transport -postfork: transport 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 -postfork: qrun delivery -delivering 10HmaY-0005vi-00 (queue run pid ppppp) +delivering 10HmaY-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun delivery forking for transport -postfork: transport 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 -postfork: qrun delivery -delivering 10HmaX-0005vi-00 (queue run pid ppppp) +delivering 10HmaX-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun delivery forking for transport -postfork: transport T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK 250 PIPELINING - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 OK SMTP<< 351 Send more SMTP>> writing message and terminating "." + SMTP>> . SMTP<< 250 OK -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport -postfork: 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)>> +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:351:.:250' LOG: MAIN => a@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK" LOG: MAIN @@ -68,30 +46,31 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmaY-0005vi-00 (queue run pid ppppp) +delivering 10HmaY-0005vi-00 (queue run pid pppp) R: client (ACL) -continued-transport forking for transport -postfork: transport T: send_to_server (ACL) - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA -continued-transport forked for transport: npppp SMTP<< 250 OK SMTP<< 250 OK SMTP<< 351 Send more SMTP>> writing message and terminating "." + SMTP>> . + SMTP+> QUIT + SMTP(shutdown)>> + SMTP<< 250 OK SMTP<< 250 OK - SMTP>> QUIT SMTP(close)>> +cmdlog: 'MAIL|:RCPT|:DATA:250:250:351:.:QUIT:250:250' LOG: MAIN => b@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN End queue run: pid=pppp -qq ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -101,102 +80,70 @@ LOG: queue_run MAIN Start queue run: pid=pppp -qq queue running combined directories looking in TESTSUITE/spool//input -fresh-exec forking for qrun delivery -postfork: qrun delivery -delivering 10HmaZ-0005vi-00 (queue run pid ppppp) +delivering 10HmaZ-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun delivery forking for transport -postfork: transport 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 -postfork: qrun delivery -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun delivery forking for transport -postfork: transport 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 -postfork: qrun delivery -delivering 10HmaZ-0005vi-00 (queue run pid ppppp) +delivering 10HmaZ-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun delivery forking for transport -postfork: transport T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK 250 PIPELINING - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 550 NO SMTP<< 503 Unexpected RCPT SMTP<< 503 Unexpected DATA - SMTP>> QUIT + SMTP+> QUIT + SMTP(shutdown)>> + SMTP<< 250 OK SMTP(close)>> -fresh-exec forked for qrun delivery: npppp -qrun delivery forked for transport: npppp +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:550:503:503:QUIT:250' LOG: MAIN ** a@test.ex F= 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:: 550 NO -qrun delivery forking for bounce message -postfork: bounce message -qrun delivery forked for bounce message: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -fresh-exec forking for qrun delivery -postfork: qrun delivery -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun delivery forking for transport -postfork: transport 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 >>>>>>>>>>>>>>>> LOG: queue_run MAIN End queue run: pid=pppp -qq ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qqf -fresh-exec forking for qrun delivery -postfork: qrun delivery -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun delivery forking for transport -postfork: transport 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 -postfork: qrun delivery -delivering 10HmbB-0005vi-00 (queue run pid ppppp) +delivering 10HmbB-0005vi-00 (queue run pid pppp) R: bounce (ACL) LOG: MAIN ** CALLER@test.ex F=<> R=bounce: just discard @@ -205,58 +152,37 @@ LOG: MAIN LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -fresh-exec forked for qrun delivery: npppp -fresh-exec forking for qrun delivery -postfork: qrun delivery -delivering 10HmbC-0005vi-00 (queue run pid ppppp) +delivering 10HmbC-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun delivery forking for transport -postfork: transport 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 -postfork: qrun delivery -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun delivery forking for transport -postfork: transport T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK 250 PIPELINING - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 550 Unknown SMTP<< 503 Unexpected DATA SMTP>> RSET SMTP<< 250 OK -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport -postfork: 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)>> +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:550:503:RSET:250' LOG: MAIN ** b@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 Unknown -qrun delivery forking for bounce message -postfork: bounce message -qrun delivery forked for bounce message: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -265,27 +191,28 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmbC-0005vi-00 (queue run pid ppppp) +delivering 10HmbC-0005vi-00 (queue run pid pppp) R: client (ACL) -continued-transport forking for transport -postfork: transport T: send_to_server (ACL) - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA -continued-transport forked for transport: npppp SMTP<< 250 OK SMTP<< 250 OK SMTP<< 351 OK SMTP>> writing message and terminating "." + SMTP>> . + SMTP+> QUIT + SMTP(shutdown)>> + SMTP<< 250 OK SMTP<< 250 OK - SMTP>> QUIT SMTP(close)>> +cmdlog: 'MAIL|:RCPT|:DATA:250:250:351:.:QUIT:250:250' LOG: MAIN => c@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN End queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>