X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/afd5e75ffc8f64f0ebed1df9dce64793011c14a6..a95acb1c19c2e3600ef327c71318e33316d34440:/test/stderr/0218 diff --git a/test/stderr/0218 b/test/stderr/0218 index 5d7c1d843..a048735a2 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -7,17 +7,17 @@ LOG: queue_run MAIN Start queue run: pid=pppp -qq queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaX-0005vi-00 (queue run pid ppppp) +delivering 10HmaX-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmaY-0005vi-00 (queue run pid ppppp) +delivering 10HmaY-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaX-0005vi-00 (queue run pid ppppp) +delivering 10HmaX-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected @@ -25,15 +25,17 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected 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>> (writing message) + SMTP>> . SMTP<< 250 OK 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 @@ -44,27 +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) T: send_to_server (ACL) - 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>> (writing message) + 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 @@ -74,17 +80,17 @@ LOG: queue_run MAIN Start queue run: pid=pppp -qq queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaZ-0005vi-00 (queue run pid ppppp) +delivering 10HmaZ-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaZ-0005vi-00 (queue run pid ppppp) +delivering 10HmaZ-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected @@ -92,14 +98,17 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected 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)>> +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 Exim version x.yz .... @@ -108,11 +117,11 @@ 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 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused @@ -123,18 +132,18 @@ LOG: MAIN >>>>>>>>>>>>>>>> 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 -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -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 @@ -143,11 +152,11 @@ LOG: MAIN LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbC-0005vi-00 (queue run pid ppppp) +delivering 10HmbC-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected @@ -155,8 +164,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected 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 @@ -164,6 +173,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RSET SMTP<< 250 OK 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 Exim version x.yz .... @@ -172,7 +182,7 @@ 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 >>>>>>>>>>>>>>>> @@ -181,24 +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) T: send_to_server (ACL) - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 OK SMTP<< 351 OK - SMTP>> writing message and terminating "." + SMTP>> (writing message) + 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 >>>>>>>>>>>>>>>>