X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d8fe1c03b30ec7dba12669726e41b3b6f5303632..cafbabb774a4721e4ae7de7746ec0fc27d90d8b1:/test/stderr/0398

diff --git a/test/stderr/0398 b/test/stderr/0398
index 5a151153f..0acc6c21c 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -21,7 +21,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
@@ -67,10 +67,10 @@ routed by r2 router
   host 127.0.0.1 [127.0.0.1]
 ----------- end verify ------------
 sender qq@remote verified ok
-deny: condition test failed
+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
@@ -126,8 +126,10 @@ callout cache: no address record found
 interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
-  SMTP>> HELO mail.test.ex
+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>
@@ -144,29 +146,30 @@ wrote callout cache domain record:
 dbfn_write: key=qq@remote
 wrote negative callout cache address record
 ----------- end verify ------------
-warn: condition test succeeded
+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
+accept: condition test succeeded in ACL "rcpt"
 SMTP>> 250 Accepted
 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
 using cached sender verify result
-deny: condition test failed
+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
@@ -221,15 +224,16 @@ dbfn_read: key=qq@remote
 callout cache: found address record
 callout cache: address record is negative
 ----------- end verify ------------
-warn: condition test succeeded
+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
+accept: condition test succeeded in ACL "rcpt"
 SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection