X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/328895cc07b8caf8c18003569431a02129989289..ac20058fb01a79d2011352107b9b6e4aa3e3e35b:/test/stderr/0070

diff --git a/test/stderr/0070 b/test/stderr/0070
index ebcc21390..bb6e554a8 100644
--- a/test/stderr/0070
+++ b/test/stderr/0070
@@ -28,10 +28,11 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "rcpt"
 >>> processing "require"
+>>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "NULL"
 >>> no EHLO/HELO command was issued
->>> require: condition test failed
+>>> require: condition test failed in ACL "rcpt"
 LOG: H=[V4NET.0.0.13] F=<userx@cus.cam.ac.uk> rejected RCPT <a@b>: helo not verified
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -55,8 +56,9 @@ MUNGED: ::1 will be omitted in what follows
 >>> HELO verification failed but host is in helo_try_verify_hosts
 >>> using ACL "rcpt"
 >>> processing "require"
+>>>   message: helo not verified
 >>> check verify = helo
->>> require: condition test failed
+>>> require: condition test failed in ACL "rcpt"
 LOG: H=([V4NET.0.0.1]) [V4NET.0.0.2] F=<a@b> rejected RCPT <c@d>: helo not verified
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -80,10 +82,12 @@ MUNGED: ::1 will be omitted in what follows
 >>> matched host address
 >>> using ACL "rcpt"
 >>> processing "require"
+>>>   message: helo not verified
 >>> check verify = helo
->>> require: condition test succeeded
+>>> require: condition test succeeded in ACL "rcpt"
 >>> processing "deny"
->>> deny: condition test succeeded
+>>>   message: helo did verify
+>>> deny: condition test succeeded in ACL "rcpt"
 LOG: H=([V4NET.0.0.2]) [V4NET.0.0.2] F=<a@b> rejected RCPT <c@d>: helo did verify
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -205,9 +209,10 @@ MUNGED: ::1 will be omitted in what follows
 >>> [V4NET.0.0.99] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> processing "require"
+>>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "[V4NET.0.0.99]"
->>> require: condition test failed
+>>> require: condition test failed in ACL "rcpt"
 LOG: H=([V4NET.0.0.99]) [V4NET.0.0.13] F=<a@b> rejected RCPT <c@d>: helo not verified
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -229,12 +234,14 @@ MUNGED: ::1 will be omitted in what follows
 >>> [V4NET.0.0.13] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> processing "require"
+>>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "[V4NET.0.0.13]"
 >>> matched host address
->>> require: condition test succeeded
+>>> require: condition test succeeded in ACL "rcpt"
 >>> processing "deny"
->>> deny: condition test succeeded
+>>>   message: helo did verify
+>>> deny: condition test succeeded in ACL "rcpt"
 LOG: H=([V4NET.0.0.13]) [V4NET.0.0.13] F=<a@b> rejected RCPT <c@d>: helo did verify
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -257,11 +264,12 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "rcpt"
 >>> processing "require"
+>>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "rhubarb"
 >>> looking up host name for 99.99.99.99
 >>> Test harness: host name lookup returns DEFER
 >>> getting IP address for rhubarb
 >>> no IP address found for host rhubarb (during SMTP connection from (rhubarb) [99.99.99.99])
->>> require: condition test failed
+>>> require: condition test failed in ACL "rcpt"
 LOG: H=(rhubarb) [99.99.99.99] F=<a@b> rejected RCPT <c@d>: helo not verified