Taint: fix hybrid-mode transition

[users/jgh/exim.git] / test / stderr / 0473

diff --git a/test/stderr/0473 b/test/stderr/0473
index 2c5b343c633ed18c81736f82c5ffc5178cd708a0..27145308dd49fe1811f777b8cd3c63534e13ec2a 100644 (file)
--- a/test/stderr/0473
+++ b/test/stderr/0473
@@ -9,24 +9,26 @@ Verifying r11@two.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering r11@two.test.ex
 Attempting full verification using callout
-callout cache: found domain record
-callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+callout cache: found domain record for two.test.ex
+callout cache: no address record found for r11@two.test.ex
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 220 Server ready
   SMTP>> EHLO the.local.host.name
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
   SMTP>> RCPT TO:<r11@two.test.ex>
+  SMTP(Connection timed out)<<
 SMTP timeout
-wrote callout cache domain record:
+  SMTP(close)>>
+wrote callout cache domain record for two.test.ex:
   result=1 postmaster=0 random=0
 LOG: MAIN REJECT
-  U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout
+  U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<r11@two.test.ex>
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -38,13 +40,15 @@ Verifying r11@two.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering r11@two.test.ex
 Attempting full verification using callout
-callout cache: found domain record
-callout cache: no address record found
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
+callout cache: found domain record for two.test.ex
+callout cache: no address record found for r11@two.test.ex
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
+  SMTP(Connection timed out)<<
+  SMTP(close)>>
 SMTP timeout
 LOG: MAIN REJECT
-  U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout
+  U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after initial connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>