X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/5800e3234f2594639d82e5063d9c522c6a881d25..67cc3ad2fe09fa6197c54a18fa9eb8f1375a87ec:/test/stderr/0623

diff --git a/test/stderr/0623 b/test/stderr/0623
index b98d9285c..db3130155 100644
--- a/test/stderr/0623
+++ b/test/stderr/0623
@@ -14,10 +14,10 @@ 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)
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
+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
 cmd buf flush ddd bytes
@@ -36,7 +36,7 @@ sync_responses expect rcpt for tempreject@test.ex
   SMTP<< 250 OK rcpt
 sync_responses expect data
   SMTP<< 300 go ahead
-  SMTP>> writing message and terminating "."
+  SMTP>> (writing message)
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
  no messages waiting for 127.0.0.1
@@ -55,13 +55,13 @@ 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
+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
   == tempreject@test.ex R=client T=send_to_server defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 451 Service not available
->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
@@ -78,12 +78,12 @@ 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)
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
+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
 cmd buf flush ddd bytes
@@ -102,7 +102,7 @@ sync_responses expect rcpt for permreject@test.ex
   SMTP<< 250 OK rcpt
 sync_responses expect data
   SMTP<< 300 go ahead
-  SMTP>> writing message and terminating "."
+  SMTP>> (writing message)
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
  no messages waiting for 127.0.0.1
@@ -126,8 +126,8 @@ LOG: MAIN
   permreject@test.ex: error ignored
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (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,12 +144,12 @@ 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)
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
+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
 cmd buf flush ddd bytes
@@ -168,7 +168,7 @@ sync_responses expect rcpt for permreject@test.ex
   SMTP<< 250 OK rcpt
 sync_responses expect data
   SMTP<< 300 go ahead
-  SMTP>> writing message and terminating "."
+  SMTP>> (writing message)
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
  no messages waiting for 127.0.0.1
@@ -187,10 +187,10 @@ 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
+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=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (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 >>>>>>>>>>>>>>>>