Merge branch 'master' of ssh://git.exim.org/home/git/exim

[exim.git] / test / stderr / 0124

diff --git a/test/stderr/0124 b/test/stderr/0124
index bd2443aa8959b8f6dda86c8ed04265372d2de7d9..328d78084840470522e370fea2f613090620c2a3 100644 (file)
--- a/test/stderr/0124
+++ b/test/stderr/0124
@@ -10,12 +10,12 @@
 >>> processing "accept"
 >>> check hosts = :
 >>> host in ":"? no (end of list)
->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept"
 >>> check domains = +local_domains
 >>> external.test.ex in "test.ex"? no (end of list)
 >>> external.test.ex in "+local_domains"? no (end of list)
->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept"
 >>> check hosts = +relay_hosts
 >>> sender host name required, to match against *.friendly.test.ex
@@ -23,24 +23,26 @@
 LOG: no host name found for IP address V4NET.0.0.97
 >>> host in "*.friendly.test.ex"? no (failed to find host name for V4NET.0.0.97)
 >>> host in "+relay_hosts"? no (end of list)
->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
->>> deny: condition test succeeded
+>>>   message: relay not permitted
+>>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted
 >>> using ACL "check_recipient"
 >>> processing "accept"
 >>> check hosts = :
 >>> host in ":"? no (end of list)
->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept"
 >>> check domains = +local_domains
 >>> external.test.ex in "test.ex"? no (end of list)
 >>> external.test.ex in "+local_domains"? no (end of list)
->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept"
 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"? no (end of list)
->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny"
->>> deny: condition test succeeded
+>>>   message: relay not permitted
+>>> deny: condition test succeeded in ACL "check_recipient"
 LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted