X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/e7c3638eeaa194613d5c551382aded17da9b2be0..114b01dded2c9d72cdd44cac97a4d3cc9f22ddfd:/test/stderr/0623?ds=sidebyside diff --git a/test/stderr/0623 b/test/stderr/0623 index 45780b023..ce3804c13 100644 --- a/test/stderr/0623 +++ b/test/stderr/0623 @@ -14,9 +14,9 @@ send_to_server transport entered tempreject@test.ex using the transport's hosts: 127.0.0.1 getting address for 127.0.0.1 -checking status of 127.0.0.1 +checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (tempreject@test.ex) +delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (tempreject@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -54,8 +54,8 @@ LOG: MAIN ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT:451:221' -added retry item for T:127.0.0.1:127.0.0.1:1225:10HmaZ-0005vi-00: errno=-46 more_errno=dd,A flags=6 +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT+:451:221' +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmaZ-000000005vi-0000: errno=-46 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN @@ -78,11 +78,11 @@ send_to_server transport entered permreject@test.ex using the transport's hosts: 127.0.0.1 getting address for 127.0.0.1 -checking status of 127.0.0.1 +checking retry status of 127.0.0.1 no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmbA-0005vi-00 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) +delivering 10HmbA-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -118,7 +118,7 @@ cmd buf flush ddd bytes (more expected) ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT:550:221' +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT+:550:221' Leaving send_to_server transport LOG: MAIN ** permreject@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 content rejected @@ -126,8 +126,8 @@ LOG: MAIN permreject@test.ex: error ignored LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -144,11 +144,11 @@ send_to_server transport entered permreject@test.ex using the transport's hosts: 127.0.0.1 getting address for 127.0.0.1 -checking status of 127.0.0.1 +checking retry status of 127.0.0.1 no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmbB-0005vi-00 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) +delivering 10HmbB-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -186,11 +186,11 @@ LOG: MAIN ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP(closed)<< SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT' -added retry item for T:127.0.0.1:127.0.0.1:1225:10HmbB-0005vi-00: errno=-18 more_errno=dd,A flags=6 +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT+' +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmbB-000000005vi-0000: errno=-18 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN == permreject@test.ex R=client T=send_to_server defer (-18) H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to end of data ->>>>>>>>>>>>>>>> Exim pid=p1240 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>