Add ACL name to debug output of condition result (bug 1238).

[exim.git] / test / stderr / 0017

diff --git a/test/stderr/0017 b/test/stderr/0017
index 90e43c069f70b5deda746b2199869dd194d3cbed..4831e3e9af6b0a65e0bdbdcae561134e3df4e038 100644 (file)
--- a/test/stderr/0017
+++ b/test/stderr/0017
@@ -12,18 +12,18 @@ LOG: ETRN some.random.domain received from [1.1.1.1]
 >>> processing "deny"
 >>> check hosts = 10.9.8.7
 >>> host in "10.9.8.7"? no (end of list)
 >>> processing "deny"
 >>> check hosts = 10.9.8.7
 >>> host in "10.9.8.7"? no (end of list)

->>> deny: condition test failed
+>>> deny: condition test failed in ACL "check_etrn"

 >>> processing "deny"
 >>> check hosts = 10.9.8.8
 >>> host in "10.9.8.8"? no (end of list)
 >>> processing "deny"
 >>> check hosts = 10.9.8.8
 >>> host in "10.9.8.8"? no (end of list)

->>> deny: condition test failed
+>>> deny: condition test failed in ACL "check_etrn"

 >>> processing "accept"
 >>> check hosts = localhost
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=localhost address=127.0.0.1
 >>> host in "localhost"? no (end of list)
 >>> processing "accept"
 >>> check hosts = localhost
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=localhost address=127.0.0.1
 >>> host in "localhost"? no (end of list)

->>> accept: condition test failed
+>>> accept: condition test failed in ACL "check_etrn"

 >>> end of ACL "check_etrn": implicit DENY
 LOG: H=[1.1.1.1] rejected ETRN some.random.domain
 >>> host in hosts_connection_nolog? no (option unset)
 >>> end of ACL "check_etrn": implicit DENY
 LOG: H=[1.1.1.1] rejected ETRN some.random.domain
 >>> host in hosts_connection_nolog? no (option unset)


@@ -41,7 +41,7 @@ LOG: ETRN some.domain received from [10.9.8.7]
 >>> check hosts = 10.9.8.7
 >>> host in "10.9.8.7"? yes (matched "10.9.8.7")
 >>> check sender_domains = some.domain
 >>> check hosts = 10.9.8.7
 >>> host in "10.9.8.7"? yes (matched "10.9.8.7")
 >>> check sender_domains = some.domain

->>> deny: condition test error
+>>> deny: condition test error in ACL "check_etrn"

 LOG: H=[10.9.8.7] temporarily rejected ETRN some.domain: cannot test sender_domains condition in ETRN ACL
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 LOG: H=[10.9.8.7] temporarily rejected ETRN some.domain: cannot test sender_domains condition in ETRN ACL
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)


@@ -57,10 +57,10 @@ LOG: ETRN some.domain received from [10.9.8.8]
 >>> processing "deny"
 >>> check hosts = 10.9.8.7
 >>> host in "10.9.8.7"? no (end of list)
 >>> processing "deny"
 >>> check hosts = 10.9.8.7
 >>> host in "10.9.8.7"? no (end of list)

->>> deny: condition test failed
+>>> deny: condition test failed in ACL "check_etrn"

 >>> processing "deny"
 >>> check hosts = 10.9.8.8
 >>> host in "10.9.8.8"? yes (matched "10.9.8.8")
 >>> check senders = x@y
 >>> processing "deny"
 >>> check hosts = 10.9.8.8
 >>> host in "10.9.8.8"? yes (matched "10.9.8.8")
 >>> check senders = x@y

->>> deny: condition test error
+>>> deny: condition test error in ACL "check_etrn"

 LOG: H=[10.9.8.8] temporarily rejected ETRN some.domain: cannot test senders condition in ETRN ACL
 LOG: H=[10.9.8.8] temporarily rejected ETRN some.domain: cannot test senders condition in ETRN ACL