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

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

diff --git a/test/stderr/3211 b/test/stderr/3211
index 08a48ac49cd5122dfeba7095b67f09e0d386da99..2ae0bde590e9343e3b15eb3acf378636d9da8933 100644 (file)
--- a/test/stderr/3211
+++ b/test/stderr/3211
@@ -7,7 +7,7 @@
 >>> 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 17)
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.again.dns
@@ -15,11 +15,12 @@
 >>> calling skipped router
 >>> skipped router declined for userx@test.again.dns
 >>> calling temp router
+>>> test.again.dns in "*"? yes (matched "*")
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> temp router: defer for userx@test.again.dns
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------
->>> accept: condition test deferred
+>>> accept: condition test deferred in ACL "check_recipient"
 LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.dns>: host lookup did not complete
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -30,15 +31,16 @@ LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.d
 >>> 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 17)
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing r1-userx@test.again.dns
 >>> test.again.dns in "!testdb;fail"? yes (end of list)
 >>> calling r1 router
+>>> test.again.dns in "*"? yes (matched "*")
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> r1 router: defer for r1-userx@test.again.dns
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------
->>> accept: condition test deferred
+>>> accept: condition test deferred in ACL "check_recipient"
 LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <r1-userx@test.again.dns>: host lookup did not complete