Cancel in-progress or reject requeted cutthrough when fakereject. Bug 1475

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

diff --git a/test/stderr/3205 b/test/stderr/3205
index c1c1da23019586cd12d72f33b7734edf5c6a45a6..279f0d0ce88f5b398fffd0a06b88af8d27c1d63d 100644 (file)
--- a/test/stderr/3205
+++ b/test/stderr/3205
@@ -9,8 +9,8 @@
 >>> using ACL "acl_1_2_3_4"
 >>> processing "deny"
 >>> check senders = testdb;defer
 >>> using ACL "acl_1_2_3_4"
 >>> processing "deny"
 >>> check senders = testdb;defer

->>> userx@external.test.ex in "testdb;defer"? lookup deferred for testdb;defer
->>> deny: condition test deferred
+>>> userx@external.test.ex in "testdb;defer"? list match deferred for testdb;defer
+>>> deny: condition test deferred in ACL "acl_1_2_3_4"

 LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)


@@ -24,9 +24,9 @@ LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@tes
 >>> processing "accept"
 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> processing "accept"
 >>> check hosts = :
 >>> host in ":"? no (end of list)

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

 >>> processing "deny"
 >>> check hosts = testdb;defer
 >>> processing "deny"
 >>> check hosts = testdb;defer

->>> host in "testdb;defer"? lookup deferred for testdb;defer
->>> deny: condition test deferred
+>>> host in "testdb;defer"? list match deferred for testdb;defer
+>>> deny: condition test deferred in ACL "acl_4_3_2_1"

 LOG: H=[4.3.2.1] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER
 LOG: H=[4.3.2.1] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER