X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ef8ef6c168a552e61ecde1d8d2cd816f2e87614b..ced0bbf43860a2e4ddc88e3ba20ae731324586c5:/test/stderr/0218?ds=inline diff --git a/test/stderr/0218 b/test/stderr/0218 index 1e63d0288..43c39ff22 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -4,178 +4,146 @@ admin user dropping to exim gid; retaining priv uid Single queue run LOG: queue_run MAIN - Start queue run: pid=pppp -qq + Start queue run: pid=p1234 -qq queue running combined directories looking in TESTSUITE/spool//input -fresh-exec forking for qrun-delivery -delivering 10HmaX-0005vi-00 (queue run pid ppppp) +delivering 10HmaX-000000005vi-0000 (queue run pid p1234) R: client (ACL) -qrun-delivery forking for 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 -delivering 10HmaY-0005vi-00 (queue run pid ppppp) +>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +delivering 10HmaY-000000005vi-0000 (queue run pid p1234) R: client (ACL) -qrun-delivery forking for 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 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input -fresh-exec forking for qrun-delivery -delivering 10HmaX-0005vi-00 (queue run pid ppppp) +delivering 10HmaX-000000005vi-0000 (queue run pid p1234) R: client (ACL) -qrun-delivery forking for transport 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 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 -transport forking for continued-transport-interproc -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)>> +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 Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... 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-000000005vi-0000 (queue run pid p1234) R: client (ACL) -continued-transport forking for 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>> (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 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qq ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 -qq +>>>>>>>>>>>>>>>> Exim pid=p1234 (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 Single queue run LOG: queue_run MAIN - Start queue run: pid=pppp -qq + Start queue run: pid=p1235 -qq queue running combined directories looking in TESTSUITE/spool//input -fresh-exec forking for qrun-delivery -delivering 10HmaZ-0005vi-00 (queue run pid ppppp) +delivering 10HmaZ-000000005vi-0000 (queue run pid p1235) R: client (ACL) -qrun-delivery forking for 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 -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +>>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +delivering 10HmbA-000000005vi-0000 (queue run pid p1235) R: client (ACL) -qrun-delivery forking for 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 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1242 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input -fresh-exec forking for qrun-delivery -delivering 10HmaZ-0005vi-00 (queue run pid ppppp) +delivering 10HmaZ-000000005vi-0000 (queue run pid p1235) R: client (ACL) -qrun-delivery forking for transport 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 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 -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 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> + <= <> R=10HmaZ-000000005vi-0000 U=EXIMUSER P=local S=sss +>>>>>>>>>>>>>>>> Exim pid=p1243 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -fresh-exec forking for qrun-delivery -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +>>>>>>>>>>>>>>>> Exim pid=p1244 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +delivering 10HmbA-000000005vi-0000 (queue run pid p1235) R: client (ACL) -qrun-delivery forking for transport 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 -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 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1245 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qq ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1235 -qq +>>>>>>>>>>>>>>>> Exim pid=p1235 (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 -delivering 10HmbA-0005vi-00 (queue run pid ppppp) + Start queue run: pid=p1236 -qqf +delivering 10HmbA-000000005vi-0000 (queue run pid p1236) R: client (ACL) -qrun-delivery forking for 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 -delivering 10HmbB-0005vi-00 (queue run pid ppppp) +>>>>>>>>>>>>>>>> Exim pid=p1246 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +delivering 10HmbB-000000005vi-0000 (queue run pid p1236) R: bounce (ACL) LOG: MAIN ** CALLER@test.ex F=<> R=bounce: just discard @@ -183,80 +151,68 @@ LOG: MAIN CALLER@test.ex: error ignored 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 -delivering 10HmbC-0005vi-00 (queue run pid ppppp) +>>>>>>>>>>>>>>>> Exim pid=p1247 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +delivering 10HmbC-000000005vi-0000 (queue run pid p1236) R: client (ACL) -qrun-delivery forking for 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 -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +>>>>>>>>>>>>>>>> Exim pid=p1248 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +delivering 10HmbA-000000005vi-0000 (queue run pid p1236) R: client (ACL) -qrun-delivery forking for transport 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 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 -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)>> +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 -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 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> + <= <> R=10HmbA-000000005vi-0000 U=EXIMUSER P=local S=sss +>>>>>>>>>>>>>>>> Exim pid=p1249 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1250 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... 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-000000005vi-0000 (queue run pid p1236) R: client (ACL) -continued-transport forking for 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>> (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 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1251 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1236 -qqf +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>