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

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

diff --git a/test/stderr/0308 b/test/stderr/0308
index 4a89c24ea5a9c999c012e3c93ab8f5c755839a6a..091b39590fb0352af25fa09dceb9764a6faba9d2 100644 (file)
--- a/test/stderr/0308
+++ b/test/stderr/0308
@@ -7,17 +7,18 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_V4NET_0_0"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = *.test.ex
 >>> sender host name required, to match against *.test.ex
 >>> looking up host name for V4NET.0.0.97
 LOG: no host name found for IP address V4NET.0.0.97
 >>> host in "*.test.ex"? no (failed to find host name for V4NET.0.0.97)
 >>> accept: condition test failed in ACL "acl_V4NET_0_0"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)
 >>> check hosts = V4NET.0.0.97
 >>> host in "V4NET.0.0.97"? yes (matched "V4NET.0.0.97")
 >>> accept: condition test succeeded in ACL "acl_V4NET_0_0"
+>>> end of ACL "acl_V4NET_0_0": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -27,15 +28,13 @@ LOG: no host name found for IP address V4NET.0.0.97
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_V4NET_0_0"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = *.test.ex
 >>> sender host name required, to match against *.test.ex
 >>> looking up host name for V4NET.0.0.1
->>> IP address lookup yielded ten-1.test.ex
-MUNGED: ::1 will be omitted in what follows
->>> get[host|ipnode]byname[2] looked up these IP addresses:
->>>   name=ten-1.test.ex address=V4NET.0.0.1
+>>> IP address lookup yielded "ten-1.test.ex"
 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> host in "*.test.ex"? yes (matched "*.test.ex")
 >>> accept: condition test succeeded in ACL "acl_V4NET_0_0"
+>>> end of ACL "acl_V4NET_0_0": ACCEPT