Cutthrough: handle request when a callout-hold is active. Bug 2604

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

diff --git a/test/stderr/0234 b/test/stderr/0234
index 2a318e118e3d45db5b1a1142aed0ac60527965be..ffc440678b2cc2ffefb6e0252eb573cd52d3b265 100644 (file)
--- a/test/stderr/0234
+++ b/test/stderr/0234
@@ -7,27 +7,31 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 19)

 >>> 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
->>> processing "deny"
->>> deny: condition test succeeded
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "deny" (TESTSUITE/test-config 20)
+>>>   message: relay not permitted
+>>> deny: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": DENY

 LOG: H=[V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 >>> using 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"
+>>> processing "accept" (TESTSUITE/test-config 19)

 >>> check domains = +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")
 >>> check domains = +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"
+>>> end of ACL "check_recipient": ACCEPT

 >>> using ACL "check_recipient"
 >>> using ACL "check_recipient"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 19)

 >>> check domains = +relay_domains
 >>> local host in host list - removed hosts:
 >>> check domains = +relay_domains
 >>> local host in host list - removed hosts:

->>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6

 >>>   ten-2.test.ex V4NET.0.0.2 6
 >>>   ten-2.test.ex V4NET.0.0.2 6

+>>>   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")
 >>> 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"
+>>> end of ACL "check_recipient": ACCEPT