Make router_name and transport_name usable for the expansions

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

diff --git a/test/stderr/0524 b/test/stderr/0524
index a499dbf31b98995f6793b92cd4425a67831c87e3..e466df52eb8adcfa880acbe3891bf047548940d0 100644 (file)
--- a/test/stderr/0524
+++ b/test/stderr/0524
@@ -11,14 +11,14 @@
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>> check verify = csa
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>> check verify = csa

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_mail"

 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>> check verify = csa
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>> check verify = csa

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

 >>> accept: endpass encountered - denying access
 LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization failed (host name not authorized)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> accept: endpass encountered - denying access
 LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization failed (host name not authorized)
 >>> host in hosts_connection_nolog? no (option unset)


@@ -34,7 +34,7 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>> check verify = csa
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>> check verify = csa

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

 >>> accept: endpass encountered - denying access
 LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (client address mismatch)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> accept: endpass encountered - denying access
 LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (client address mismatch)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")


@@ -43,6 +43,6 @@ LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>> check verify = csa
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>> check verify = csa

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

 >>> accept: endpass encountered - denying access
 LOG: H=(csa2.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (host name not authorized)
 >>> accept: endpass encountered - denying access
 LOG: H=(csa2.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (host name not authorized)