MySQL, pgsql: per-query server options outside the lookup string. Bug 2546

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

diff --git a/test/stderr/3205 b/test/stderr/3205
index c1c1da23019586cd12d72f33b7734edf5c6a45a6..012f5aed404fd8977ee35d6581e97799e966290f 100644 (file)
--- a/test/stderr/3205
+++ b/test/stderr/3205
@@ -7,10 +7,10 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_1_2_3_4"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 17)
 >>> 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)
@@ -21,12 +21,12 @@ LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@tes
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_4_3_2_1"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 23)
 >>> check hosts = :
 >>> host in ":"? no (end of list)
->>> accept: condition test failed
->>> processing "deny"
+>>> accept: condition test failed in ACL "acl_4_3_2_1"
+>>> processing "deny" (TESTSUITE/test-config 24)
 >>> 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