X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/4da19af657ed2687d20c1eb8cf85a66a70804e2d..48d6f3b6c68a33a4ff11650f9f0de858cb5fc256:/test/stderr/0218 diff --git a/test/stderr/0218 b/test/stderr/0218 index 216734dd2..523585d5b 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -7,20 +7,27 @@ LOG: queue_run MAIN Start queue run: pid=p1234 -qq queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaX-0005vi-00 (queue run pid p1234) +delivering 10HmaX-000000005vi-0000 (queue run pid p1234) +test.ex in ""? no (end of list) +CALLER@test.ex in senders? no (end of list) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmaY-0005vi-00 (queue run pid p1234) +delivering 10HmaY-000000005vi-0000 (queue run pid p1234) +test.ex in ""? no (end of list) +CALLER@test.ex in senders? no (end of list) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaX-0005vi-00 (queue run pid p1234) +delivering 10HmaX-000000005vi-0000 (queue run pid p1234) +test.ex in ""? no (end of list) +CALLER@test.ex in senders? no (end of list) R: client (ACL) T: send_to_server (ACL) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... +connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK @@ -46,7 +53,9 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmaY-0005vi-00 (queue run pid p1234) +delivering 10HmaY-000000005vi-0000 (queue run pid p1234) +test.ex in ""? no (end of list) +CALLER@test.ex in senders? no (end of list) R: client (ACL) T: send_to_server (ACL) SMTP|> MAIL FROM: @@ -62,7 +71,7 @@ T: send_to_server (ACL) SMTP<< 250 OK SMTP<< 250 OK SMTP(close)>> -cmdlog: 'MAIL|:RCPT|:DATA:250:250:351:.:QUIT:250:250' +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 @@ -80,20 +89,27 @@ LOG: queue_run MAIN Start queue run: pid=p1235 -qq queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaZ-0005vi-00 (queue run pid p1235) +delivering 10HmaZ-000000005vi-0000 (queue run pid p1235) +test.ex in ""? no (end of list) +CALLER@test.ex in senders? no (end of list) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid p1235) +delivering 10HmbA-000000005vi-0000 (queue run pid p1235) +test.ex in ""? no (end of list) +CALLER@test.ex in senders? no (end of list) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=p1242 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaZ-0005vi-00 (queue run pid p1235) +delivering 10HmaZ-000000005vi-0000 (queue run pid p1235) +test.ex in ""? no (end of list) +CALLER@test.ex in senders? no (end of list) R: client (ACL) T: send_to_server (ACL) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... +connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK @@ -108,7 +124,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP(shutdown)>> SMTP<< 250 OK SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:550:503:503:QUIT:250' +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 .... @@ -116,15 +132,18 @@ configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN - <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss + <= <> R=10HmaZ-000000005vi-0000 U=EXIMUSER P=local S=sss >>>>>>>>>>>>>>>> Exim pid=p1243 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1244 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid p1235) +delivering 10HmbA-000000005vi-0000 (queue run pid p1235) +test.ex in ""? no (end of list) +CALLER@test.ex in senders? no (end of list) R: client (ACL) T: send_to_server (ACL) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... + failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused LOG: MAIN @@ -139,11 +158,13 @@ admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=p1236 -qqf -delivering 10HmbA-0005vi-00 (queue run pid p1236) +delivering 10HmbA-000000005vi-0000 (queue run pid p1236) +test.ex in ""? no (end of list) +CALLER@test.ex in senders? no (end of list) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=p1246 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbB-0005vi-00 (queue run pid p1236) +delivering 10HmbB-000000005vi-0000 (queue run pid p1236) R: bounce (ACL) LOG: MAIN ** CALLER@test.ex F=<> R=bounce: just discard @@ -152,14 +173,19 @@ LOG: MAIN LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1247 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbC-0005vi-00 (queue run pid p1236) +delivering 10HmbC-000000005vi-0000 (queue run pid p1236) +test.ex in ""? no (end of list) +CALLER@test.ex in senders? no (end of list) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=p1248 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid p1236) +delivering 10HmbA-000000005vi-0000 (queue run pid p1236) +test.ex in ""? no (end of list) +CALLER@test.ex in senders? no (end of list) R: client (ACL) T: send_to_server (ACL) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... +connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK @@ -181,7 +207,7 @@ configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN - <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss + <= <> R=10HmbA-000000005vi-0000 U=EXIMUSER P=local S=sss >>>>>>>>>>>>>>>> Exim pid=p1249 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed @@ -191,7 +217,9 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmbC-0005vi-00 (queue run pid p1236) +delivering 10HmbC-000000005vi-0000 (queue run pid p1236) +test.ex in ""? no (end of list) +CALLER@test.ex in senders? no (end of list) R: client (ACL) T: send_to_server (ACL) SMTP|> MAIL FROM: @@ -207,7 +235,7 @@ T: send_to_server (ACL) SMTP<< 250 OK SMTP<< 250 OK SMTP(close)>> -cmdlog: 'MAIL|:RCPT|:DATA:250:250:351:.:QUIT:250:250' +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