Cutthrough: avoid use of callout result cache

[exim.git] / test / stderr / 0462

diff --git a/test/stderr/0462 b/test/stderr/0462
index 255a7696a2ef48f544290e4769007278f4b7b75e..f8cb9b7c60d39d60d375307eea0b39f8f7230fb4 100644 (file)
--- a/test/stderr/0462
+++ b/test/stderr/0462
@@ -9,10 +9,10 @@ Verifying Ok@localhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering Ok@localhost
 Attempting full verification using callout
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 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
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK


@@ -28,9 +28,9 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> RCPT TO:<postmaster@localhost>
   SMTP<< 550 NO
   SMTP>> QUIT
   SMTP>> RCPT TO:<postmaster@localhost>
   SMTP<< 550 NO
   SMTP>> QUIT

-wrote callout cache domain record:
+wrote callout cache domain record for localhost:

   result=1 postmaster=2 random=0
   result=1 postmaster=2 random=0

-wrote positive callout cache address record
+wrote positive callout cache address record for Ok@localhost

 LOG: MAIN REJECT
   H=[V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: response to "RCPT TO:<postmaster@localhost>" from 127.0.0.1 [127.0.0.1] was: 550 NO
 created log directory TESTSUITE/spool/log
 LOG: MAIN REJECT
   H=[V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: response to "RCPT TO:<postmaster@localhost>" from 127.0.0.1 [127.0.0.1] was: 550 NO
 created log directory TESTSUITE/spool/log


@@ -41,8 +41,8 @@ Verifying Ok@localhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering Ok@localhost
 Attempting full verification using callout
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 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
 callout cache: address record is positive
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT


@@ -58,10 +58,10 @@ Verifying NOTok@elsewhere
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering NOTok@elsewhere
 Attempting full verification using callout
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering NOTok@elsewhere
 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 elsewhere
+callout cache: no address record found for NOTok@elsewhere
+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
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK


@@ -70,9 +70,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
   SMTP>> RCPT TO:<NOTok@elsewhere>
   SMTP<< 550 NO
   SMTP>> QUIT
   SMTP>> RCPT TO:<NOTok@elsewhere>
   SMTP<< 550 NO
   SMTP>> QUIT

-wrote callout cache domain record:
+wrote callout cache domain record for elsewhere:

   result=1 postmaster=0 random=0
   result=1 postmaster=0 random=0

-wrote negative callout cache address record
+wrote negative callout cache address record for NOTok@elsewhere

 LOG: MAIN REJECT
   H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: response to "RCPT TO:<NOTok@elsewhere>" from 127.0.0.1 [127.0.0.1] was: 550 NO
 LOG: MAIN REJECT
 LOG: MAIN REJECT
   H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: response to "RCPT TO:<NOTok@elsewhere>" from 127.0.0.1 [127.0.0.1] was: 550 NO
 LOG: MAIN REJECT


@@ -91,10 +91,10 @@ Verifying NOTok2@elsewhere
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering NOTok2@elsewhere
 Attempting full verification using callout
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering NOTok2@elsewhere
 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 elsewhere
+callout cache: no address record found for NOTok2@elsewhere
+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
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK


@@ -103,9 +103,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected
   SMTP>> RCPT TO:<NOTok2@elsewhere>
   SMTP<< 550 NO
   SMTP>> QUIT
   SMTP>> RCPT TO:<NOTok2@elsewhere>
   SMTP<< 550 NO
   SMTP>> QUIT

-wrote callout cache domain record:
+wrote callout cache domain record for elsewhere:

   result=1 postmaster=0 random=0
   result=1 postmaster=0 random=0

-wrote negative callout cache address record
+wrote negative callout cache address record for NOTok2@elsewhere

 LOG: MAIN REJECT
   H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
 LOG: smtp_connection MAIN
 LOG: MAIN REJECT
   H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
 LOG: smtp_connection MAIN