Use dsn_from for success-DSN messages. Bug 2404

[exim.git] / test / stderr / 0524

diff --git a/test/stderr/0524 b/test/stderr/0524
index d839bc3d3747932febe1491cd27f4016f078ca83..8344d34a6e1678f55fd66fa64521894d915170b4 100644 (file)
--- a/test/stderr/0524
+++ b/test/stderr/0524
@@ -7,15 +7,20 @@
 >>> 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 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 "*")
 >>> host in pipelining_advertise_hosts? yes (matched "*")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_mail"
 >>> processing "accept"
 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> 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 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 "*")
 >>> host in pipelining_advertise_hosts? yes (matched "*")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_mail"
 >>> processing "accept"
 >>>   message: CSA status is $csa_status
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>>   message: CSA status is $csa_status


@@ -32,7 +37,9 @@ 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 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 "*")
 >>> host in pipelining_advertise_hosts? yes (matched "*")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_mail"
 >>> processing "accept"
 >>>   message: CSA status is $csa_status
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>>   message: CSA status is $csa_status


@@ -42,7 +49,9 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization
 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)
 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 "*")
 >>> host in pipelining_advertise_hosts? yes (matched "*")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_mail"
 >>> processing "accept"
 >>>   message: CSA status is $csa_status
 >>> using ACL "check_mail"
 >>> processing "accept"
 >>>   message: CSA status is $csa_status