Move DSN support to mainline

[exim.git] / test / stderr / 0524

diff --git a/test/stderr/0524 b/test/stderr/0524
index a499dbf31b98995f6793b92cd4425a67831c87e3..363c8dfd119d0f442a13ad9427f85ef7e5951b6e 100644 (file)
--- a/test/stderr/0524
+++ b/test/stderr/0524
@@ -7,18 +7,23 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_mail"
 >>> processing "accept"
+>>>   message: CSA status is $csa_status
 >>> check verify = csa
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_mail"
+>>> end of ACL "check_mail": ACCEPT
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_mail"
 >>> processing "accept"
+>>>   message: CSA status is $csa_status
 >>> 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)
@@ -30,19 +35,23 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_mail"
 >>> processing "accept"
+>>>   message: CSA status is $csa_status
 >>> 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 "*")
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> using ACL "check_mail"
 >>> processing "accept"
+>>>   message: CSA status is $csa_status
 >>> 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)