Merge branch 'master' into transp_logging_1031

[users/jgh/exim.git] / test / stderr / 0234

diff --git a/test/stderr/0234 b/test/stderr/0234
index 50aa873b7279ab02b54420b1b51a412bedb65ed3..b382af22d7fd7460c82809f471be8d559d50ff4a 100644 (file)
--- a/test/stderr/0234
+++ b/test/stderr/0234
@@ -11,9 +11,9 @@
 >>> check domains = +relay_domains
 >>> d in "@mx_any"? no (end of list)
 >>> d in "+relay_domains"? no (end of list)
 >>> check domains = +relay_domains
 >>> d in "@mx_any"? no (end of list)
 >>> d in "+relay_domains"? no (end of list)

->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_recipient"

 >>> processing "deny"
 >>> processing "deny"

->>> deny: condition test succeeded
+>>> deny: condition test succeeded in ACL "check_recipient"

 LOG: H=[V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 >>> using ACL "check_recipient"
 >>> processing "accept"
 LOG: H=[V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 >>> using ACL "check_recipient"
 >>> processing "accept"


@@ -21,7 +21,7 @@ LOG: H=[V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 >>> local host has lowest MX
 >>> mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> mxt1.test.ex in "+relay_domains"? yes (matched "+relay_domains")
 >>> local host has lowest MX
 >>> mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> mxt1.test.ex in "+relay_domains"? yes (matched "+relay_domains")

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"

 >>> using ACL "check_recipient"
 >>> processing "accept"
 >>> check domains = +relay_domains
 >>> using ACL "check_recipient"
 >>> processing "accept"
 >>> check domains = +relay_domains


@@ -30,4 +30,4 @@ LOG: H=[V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>> mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> mxt6.test.ex in "+relay_domains"? yes (matched "+relay_domains")
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>> mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> mxt6.test.ex in "+relay_domains"? yes (matched "+relay_domains")

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"