Log: more info in ACL "warn statement skipped" message. Bug 2897

[exim.git] / test / stderr / 3202

diff --git a/test/stderr/3202 b/test/stderr/3202
index 795623325ad2d2a7f4893f2eba9440de544944ef..c2f454e5142e41675a90ba87940a019a1e8f27cc 100644 (file)
--- a/test/stderr/3202
+++ b/test/stderr/3202
@@ -6,12 +6,18 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "acl_1_1_1"
->>> processing "accept"
+>>> processing ACL acl_1_1_1 "accept" (TESTSUITE/test-config 17)
 >>> check hosts = net-testdb;defer
->>> host in "net-testdb;defer"? lookup deferred for net-testdb;defer
->>> accept: condition test deferred
-LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
+>>> host in "net-testdb;defer"?
+>>>  list element: net-testdb;defer
+>>> host in "net-testdb;defer"? list match deferred for net-testdb;defer
+>>> accept: condition test deferred in ACL acl_1_1_1
+LOG: H=(test) [1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -20,12 +26,18 @@ LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced D
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "acl_1_1_2"
->>> processing "deny"
+>>> processing ACL acl_1_1_2 "deny" (TESTSUITE/test-config 20)
 >>> check domains = testdb;defer
->>> y in "testdb;defer"? lookup deferred for testdb;defer
->>> deny: condition test deferred
-LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
+>>> y in "testdb;defer"?
+>>>  list element: testdb;defer
+>>> y in "testdb;defer"? list match deferred for testdb;defer
+>>> deny: condition test deferred in ACL acl_1_1_2
+LOG: H=(test) [1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -34,9 +46,15 @@ LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced D
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "acl_1_1_3"
->>> processing "require"
+>>> processing ACL acl_1_1_3 "require" (TESTSUITE/test-config 23)
 >>> check local_parts = testdb;defer
->>> x in "testdb;defer"? lookup deferred for testdb;defer
->>> require: condition test deferred
-LOG: H=[1.1.3.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
+>>> x in "testdb;defer"?
+>>>  list element: testdb;defer
+>>> x in "testdb;defer"? list match deferred for testdb;defer
+>>> require: condition test deferred in ACL acl_1_1_3
+LOG: H=(test) [1.1.3.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER