Fix logging of drop-after-EHLO-reject.

[exim.git] / test / stderr / 0476

diff --git a/test/stderr/0476 b/test/stderr/0476
index 0e649913f25f89d284d95600b48e7b894b3bb58b..6868a902c7b786874c26e5928338c676e682f937 100644 (file)
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -12,20 +12,25 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid ppppp)
 set_process_info: pppp delivering 10HmaX-0005vi-00 using t1
 t1 transport entered
   userx@test.ex
+hostlist:
+  127.0.0.1:-1
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 status = usable
 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex)
 set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO the.local.host.name
+cmd buf flush ddd bytes
   SMTP<< 250-server id
          250-PIPELINING
          250 OK
 using PIPELINING
+not using DSN
   SMTP>> MAIL FROM:<CALLER@the.local.host.name>
   SMTP>> RCPT TO:<userx@test.ex>
   SMTP>> DATA
+cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP<< 550 NO
 Remote host closed connection in response to pipelined DATA
@@ -34,7 +39,9 @@ ok=1 send_quit=1 send_rset=1 continue_more=0 yield=0 first_address is NULL
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
   SMTP>> RSET
+cmd buf flush ddd bytes
 H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET
+  SMTP(close)>>
 set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for userx@test.ex: result OK
 Leaving t1 transport
 set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@test.ex in subprocess)
@@ -62,11 +69,13 @@ set_process_info: pppp delivering 10HmaZ-0005vi-00
 set_process_info: pppp delivering 10HmaZ-0005vi-00 using t1
 t1 transport entered
   CALLER@the.local.host.name
+hostlist:
+  127.0.0.1:-1
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 status = usable
 delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name)
 set_process_info: pppp delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for CALLER@the.local.host.name: result DEFER
@@ -95,6 +104,8 @@ set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid ppppp)
 set_process_info: pppp delivering 10HmaY-0005vi-00 using t1
 t1 transport entered
   usery@test.ex
+hostlist:
+  127.0.0.1:-1
 checking status of 127.0.0.1
 no message retry record
 127.0.0.1 [127.0.0.1]:1111 status = unusable
@@ -106,7 +117,7 @@ set_process_info: pppp delivering 10HmaY-0005vi-00 (just run t1 for usery@test.e
 set_process_info: pppp delivering 10HmaY-0005vi-00: waiting for a remote delivery subprocess to finish
 set_process_info: pppp delivering 10HmaY-0005vi-00
 LOG: retry_defer MAIN
-  == usery@test.ex R=r1 T=t1 defer (-53): retry time not reached for any host
+  == usery@test.ex R=r1 T=t1 defer (-53): retry time not reached for any host for 'test.ex'
 set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00
 set_process_info: pppp running queue: waiting for children of pppp
 set_process_info: pppp running queue