Cutthrough: avoid use of callout result cache

[exim.git] / test / stderr / 0398

diff --git a/test/stderr/0398 b/test/stderr/0398
index db5c4cf790127ed6f932e3f9a1f0b64da6867dfc..0a4d1fe2305b9c49c1055d61f93007b310d15e78 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -5,6 +5,8 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -21,7 +23,7 @@ SMTP<< rcpt to:<abc@local>
 using ACL "rcpt"
 processing "deny"
 check senders = qq@remote
-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender
@@ -70,7 +72,7 @@ sender qq@remote verified ok
 deny: condition test failed in ACL "rcpt"
 processing "warn"
 check senders = qq@remote
-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender/callout
@@ -120,15 +122,16 @@ EXIM_DBOPEN(TESTSUITE/spool/db/callout)
 returned from EXIM_DBOPEN
 opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
 dbfn_read: key=remote
-callout cache: found domain record
+callout cache: found domain record for remote
 dbfn_read: key=qq@remote
-callout cache: no address record found
+callout cache: no address record found for qq@remote
 interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO mail.test.ex
   SMTP<< 250 OK
+127.0.0.1 in hosts_require_auth? no (option unset)
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
   SMTP>> RCPT TO:<qq@remote>
@@ -140,26 +143,29 @@ EXIM_DBOPEN(TESTSUITE/spool/db/callout)
 returned from EXIM_DBOPEN
 opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT
 dbfn_write: key=remote
-wrote callout cache domain record:
+wrote callout cache domain record for remote:
   result=1 postmaster=0 random=0
 dbfn_write: key=qq@remote
-wrote negative callout cache address record
+wrote negative callout cache address record for qq@remote
 ----------- end verify ------------
+l_message: $acl_verify_message
 warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN
   U=CALLER Warning: Sender verify failed: response to "RCPT TO:<qq@remote>" from 127.0.0.1 [127.0.0.1] was: 550 Unknown
 processing "accept"
 check senders = qq@remote
-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< rcpt to:<xyz@local>
 using ACL "rcpt"
 processing "deny"
 check senders = qq@remote
-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender
@@ -167,7 +173,7 @@ using cached sender verify result
 deny: condition test failed in ACL "rcpt"
 processing "warn"
 check senders = qq@remote
-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender/callout
@@ -217,21 +223,24 @@ EXIM_DBOPEN(TESTSUITE/spool/db/callout)
 returned from EXIM_DBOPEN
 opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
 dbfn_read: key=remote
-callout cache: found domain record
+callout cache: found domain record for remote
 dbfn_read: key=qq@remote
-callout cache: found address record
+callout cache: found address record for qq@remote
 callout cache: address record is negative
 ----------- end verify ------------
+l_message: $acl_verify_message
 warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN
   U=CALLER Warning: Sender verify failed
 processing "accept"
 check senders = qq@remote
-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN