Tidying

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

diff --git a/test/stderr/0069 b/test/stderr/0069
index 72ef492baa73c6a7881e9097393e0febd67d4241..0772c28b19d8803f947e4eff37363ce16db2c632 100644 (file)
--- a/test/stderr/0069
+++ b/test/stderr/0069
@@ -18,11 +18,12 @@ MUNGED: ::1 will be omitted in what follows
 >>> processing "accept"
 >>> check hosts = :
 >>> host in ":"? no (end of list)
->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_recipientx"
 >>> processing "deny"
 >>> check hosts = +include_unknown : ^ten-1\\.test\\.ex
 >>> host in "+include_unknown : ^ten-1\.test\.ex"? yes (matched "^ten-1\.test\.ex")
->>> deny: condition test succeeded
+>>> deny: condition test succeeded in ACL "check_recipientx"
+>>> end of ACL "check_recipientx": DENY
 LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<x@y> rejected RCPT <x@test.ex>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -40,13 +41,14 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> processing "accept"
 >>> check hosts = :
 >>> host in ":"? no (end of list)
->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_recipientx"
 >>> processing "deny"
 >>> check hosts = +include_unknown : ^ten-1\\.test\\.ex
 >>> sender host name required, to match against ^ten-1\.test\.ex
 >>> host in "+include_unknown : ^ten-1\.test\.ex"? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
->>> deny: condition test succeeded
+>>> deny: condition test succeeded in ACL "check_recipientx"
+>>> end of ACL "check_recipientx": DENY
 LOG: H=[V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <x@test.ex>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -66,9 +68,11 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> no IP address found for host non.existent.invalid (during SMTP connection from [V4NET.0.0.13])
 LOG: no IP address found for host non.existent.invalid (during SMTP connection from [V4NET.0.0.13])
 >>> host in "non.existent.invalid : V4NET.0.0.13"? no (failed to find IP address for non.existent.invalid)
->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_recipienty"
 >>> processing "deny"
->>> deny: condition test succeeded
+>>>   message: "Denied"
+>>> deny: condition test succeeded in ACL "check_recipienty"
+>>> end of ACL "check_recipienty": DENY
 LOG: H=[V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -89,7 +93,8 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 LOG: no IP address found for host non.existent.invalid (during SMTP connection from [V4NET.0.0.13])
 >>> failed to find IP address for non.existent.invalid: item ignored by +ignore_unknown
 >>> host in "+ignore_unknown : non.existent.invalid : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipientz"
+>>> end of ACL "check_recipientz": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -109,9 +114,11 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 LOG: no IP address found for host non.existent.invalid (during SMTP connection from [V4NET.0.0.13])
 >>> host in "non.existent.invalid : V4NET.0.0.13"? no (failed to find IP address for non.existent.invalid)
 LOG: list matching forced to fail: failed to find IP address for non.existent.invalid
->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_recipienty"
 >>> processing "deny"
->>> deny: condition test succeeded
+>>>   message: "Denied"
+>>> deny: condition test succeeded in ACL "check_recipienty"
+>>> end of ACL "check_recipienty": DENY
 LOG: H=[V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -129,13 +136,13 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> processing "accept"
 >>> check hosts = :
 >>> host in ":"? no (end of list)
->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_recipienta"
 >>> processing "deny"
 >>> check hosts = +include_defer : test.again.dns
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> host in "+include_defer : test.again.dns"? yes (DNS lookup of test.again.dns deferred)
 LOG: DNS lookup of test.again.dns deferred: accepted by +include_defer
->>> deny: condition test succeeded
+>>> deny: condition test succeeded in ACL "check_recipienta"
+>>> end of ACL "check_recipienta": DENY
 LOG: H=[V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <a@test.ex>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -153,9 +160,8 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> processing "accept"
 >>> check hosts = test.again.dns : V4NET.0.0.13
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> host in "test.again.dns : V4NET.0.0.13"? no (DNS lookup of test.again.dns deferred)
 >>> host in "test.again.dns : V4NET.0.0.13"? list match deferred for test.again.dns
->>> accept: condition test deferred
+>>> accept: condition test deferred in ACL "check_recipientb"
 LOG: H=[V4NET.0.0.13] F=<userx@test.ex> temporarily rejected RCPT <b@test.ex>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -175,4 +181,5 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> DNS lookup of test.again.dns deferred: item ignored by +ignore_defer
 >>> host in "+ignore_defer : test.again.dns : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipientc"
+>>> end of ACL "check_recipientc": ACCEPT