Cutthrough: fix operation under -bhc to not actually deliver. Bug 1800

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

diff --git a/test/stderr/0376 b/test/stderr/0376
index 4a604b5bd5363126694696a1c34e75488b869623..310e1a1016762824a0fb2d00ca247b810b97c74d 100644 (file)
--- a/test/stderr/0376
+++ b/test/stderr/0376
@@ -9,10 +9,10 @@ Verifying ok@localhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@localhost
 Attempting full verification using callout
-callout cache: no domain record found
-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: no domain record found for localhost
+callout cache: no address record found for ok@localhost
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -38,8 +38,8 @@ Verifying ok@localhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@localhost
 Attempting full verification using callout
-callout cache: found domain record
-callout cache: found address record
+callout cache: found domain record for localhost
+callout cache: found address record for ok@localhost
 callout cache: address record is positive
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
@@ -55,10 +55,10 @@ Verifying ok@localhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@localhost
 Attempting full verification using callout
-callout cache: found domain record
-callout cache: address record expired
-interface=127.0.0.1 port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... failed: Connection refused
+callout cache: found domain record for localhost
+callout cache: address record expired for ok@localhost
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
 LOG: MAIN REJECT
   H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: could not connect to 127.0.0.1 [127.0.0.1]: Connection refused
 created log directory TESTSUITE/spool/log
@@ -78,10 +78,10 @@ Verifying bad@localhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering bad@localhost
 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 localhost
+callout cache: no address record found for bad@localhost
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -111,8 +111,8 @@ Verifying bad@localhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering bad@localhost
 Attempting full verification using callout
-callout cache: found domain record
-callout cache: found address record
+callout cache: found domain record for localhost
+callout cache: found address record for bad@localhost
 callout cache: address record is negative
 LOG: MAIN REJECT
   H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
@@ -132,10 +132,10 @@ Verifying ok@localhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@localhost
 Attempting full verification using callout
-callout cache: found domain record
-callout cache: address record expired
-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 localhost
+callout cache: address record expired for ok@localhost
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -162,7 +162,7 @@ Verifying ok@localhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@localhost
 Attempting full verification using callout
-callout cache: found domain record
+callout cache: found domain record for localhost
 callout cache: domain gave initial rejection, or does not accept HELO or MAIL FROM:<>
 LOG: MAIN REJECT
   H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
@@ -182,10 +182,10 @@ Verifying ok@otherhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@otherhost
 Attempting full verification using callout
-callout cache: no domain record found
-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: no domain record found for otherhost
+callout cache: no address record found for ok@otherhost
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -222,7 +222,7 @@ Verifying ok@otherhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@otherhost
 Attempting full verification using callout
-callout cache: found domain record
+callout cache: found domain record for otherhost
 callout cache: domain does not accept RCPT TO:<postmaster@domain>
 LOG: MAIN REJECT
   H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
@@ -242,10 +242,10 @@ Verifying ok@otherhost2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@otherhost2
 Attempting full verification using callout
-callout cache: no domain record found
-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: no domain record found for otherhost2
+callout cache: no address record found for ok@otherhost2
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -278,9 +278,9 @@ Verifying ok@otherhost2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@otherhost2
 Attempting full verification using callout
-callout cache: found domain record
+callout cache: found domain record for otherhost2
 callout cache: domain accepts RCPT TO:<postmaster@domain>
-callout cache: found address record
+callout cache: found address record for ok@otherhost2
 callout cache: address record is positive
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
@@ -296,10 +296,10 @@ Verifying ok@otherhost3
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@otherhost3
 Attempting full verification using callout
-callout cache: no domain record found
-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: no domain record found for otherhost3
+callout cache: no address record found for ok@otherhost3
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -324,7 +324,7 @@ Verifying otherok@otherhost3
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering otherok@otherhost3
 Attempting full verification using callout
-callout cache: found domain record
+callout cache: found domain record for otherhost3
 callout cache: domain accepts random addresses
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
@@ -340,10 +340,10 @@ Verifying ok@otherhost4
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@otherhost4
 Attempting full verification using callout
-callout cache: no domain record found
-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: no domain record found for otherhost4
+callout cache: no address record found for ok@otherhost4
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -368,7 +368,7 @@ Verifying ok@otherhost4
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@otherhost4
 Attempting full verification using callout
-callout cache: found domain record
+callout cache: found domain record for otherhost4
 callout cache: domain accepts random addresses
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
@@ -384,10 +384,10 @@ Verifying ok@otherhost41
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@otherhost41
 Attempting full verification using callout
-callout cache: no domain record found
-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: no domain record found for otherhost41
+callout cache: no address record found for ok@otherhost41
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -426,10 +426,10 @@ Verifying ok@otherhost41
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@otherhost41
 Attempting full verification using callout
-callout cache: found domain record
+callout cache: found domain record for otherhost41
 callout cache: domain rejects random addresses
 callout cache: domain accepts RCPT TO:<postmaster@domain>
-callout cache: found address record
+callout cache: found address record for ok@otherhost41
 callout cache: address record is positive
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
@@ -445,10 +445,10 @@ Verifying ok@otherhost21
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@otherhost21
 Attempting full verification using callout
-callout cache: no domain record found
-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: no domain record found for otherhost21
+callout cache: no address record found for ok@otherhost21
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -481,11 +481,11 @@ Verifying ok2@otherhost21
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok2@otherhost21
 Attempting full verification using callout
-callout cache: found domain record
+callout cache: found domain record for otherhost21
 callout cache: domain accepts RCPT TO:<postmaster@domain>
-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: no address record found for ok2@otherhost21
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -511,10 +511,10 @@ Verifying ok@otherhost31
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@otherhost31
 Attempting full verification using callout
-callout cache: no domain record found
-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: no domain record found for otherhost31
+callout cache: no address record found for ok@otherhost31
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -546,11 +546,11 @@ Verifying okok@otherhost31
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering okok@otherhost31
 Attempting full verification using callout
-callout cache: found domain record
+callout cache: found domain record for otherhost31
 callout cache: domain rejects random addresses
-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: no address record found for okok@otherhost31
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -576,10 +576,10 @@ Verifying okokok@otherhost31
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering okokok@otherhost31
 Attempting full verification using callout
-callout cache: domain record expired
-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: domain record expired for otherhost31
+callout cache: no address record found for okokok@otherhost31
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -611,10 +611,10 @@ Verifying okok@otherhost51
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering okok@otherhost51
 Attempting full verification using callout
-callout cache: no domain record found
-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: no domain record found for otherhost51
+callout cache: no address record found for okok@otherhost51
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -642,10 +642,10 @@ Verifying okokok@otherhost52
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering okokok@otherhost52
 Attempting full verification using callout
-callout cache: no domain record found
-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: no domain record found for otherhost52
+callout cache: no address record found for okokok@otherhost52
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -679,10 +679,10 @@ Verifying abcd@x.y.z
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering abcd@x.y.z
 Attempting full verification using callout
-callout cache: no domain record found
-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: no domain record found for x.y.z
+callout cache: no address record found for abcd@x.y.z/<somesender@a.domain>
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -711,10 +711,10 @@ Verifying abcd@x.y.z
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering abcd@x.y.z
 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 x.y.z
+callout cache: no address record found for abcd@x.y.z
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -740,10 +740,10 @@ Verifying ok@otherhost9
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering ok@otherhost9
 Attempting full verification using callout
-callout cache: no domain record found
-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: no domain record found for otherhost9
+callout cache: no address record found for ok@otherhost9
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -778,10 +778,10 @@ Verifying z@test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering z@test.ex
 Attempting full verification using callout
-callout cache: no domain record found
-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: no domain record found for test.ex
+callout cache: no address record found for z@test.ex/<postmaster@myhost.test.ex>
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK