Move DSN support to mainline

Affects bug 893

1 files changed, 43 insertions, 6 deletions

diff --git a/test/stderr/5204 b/test/stderr/5204
index 2c1a98604..b6f852338 100644
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -3,6 +3,10 @@ LOG: MAIN
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "DECLINE cannot route this one (DECLINE)"@some.host
 --------> b router <--------
@@ -23,6 +27,10 @@ no more routers
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "FAIL cannot route this one (FAIL)"@some.host
 --------> b router <--------
@@ -41,6 +49,10 @@ q router forced address failure
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "ERROR cannot route this one (ERROR)"@some.host
 --------> b router <--------
@@ -62,6 +74,10 @@ q router: defer for "ERROR cannot route this one (ERROR)"@some.host
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "DEFER cannot route this one (DEFER)"@some.host
 --------> b router <--------
@@ -81,6 +97,10 @@ q router: defer for "DEFER cannot route this one (DEFER)"@some.host
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
 --------> b router <--------
@@ -108,6 +128,10 @@ routed by q router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing PASS@some.host
 --------> b router <--------
@@ -147,6 +171,10 @@ routed by s router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "FREEZE cannot route this one (FREEZE)"@some.host
 --------> b router <--------
@@ -166,6 +194,10 @@ q router: defer for "FREEZE cannot route this one (FREEZE)"@some.host
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "REDIRECT postmaster@test.ex"@some.host
 --------> b router <--------
@@ -220,6 +252,10 @@ routed by pm router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
+DSN: b propagating DSN
+DSN: q propagating DSN
+DSN: s propagating DSN
+DSN: pm propagating DSN
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.2.3.4]
@@ -231,34 +267,35 @@ host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 some.name in helo_lookup_domains? no (end of list)
+host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts? yes (matched "*")
 processing "accept"
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-routing "FAIL cannot route this one (FAIL)"@some.host
+routing "FAIL cannot route this one=(FAIL)"@some.host
 --------> b router <--------
-local_part=fail cannot route this one (fail) domain=some.host
+local_part=fail cannot route this one=(fail) domain=some.host
 checking senders
 y in ""? no (end of list)
 x@y in ":"? no (end of list)
 b router skipped: senders mismatch
 --------> q router <--------
-local_part=FAIL cannot route this one (FAIL) domain=some.host
+local_part=FAIL cannot route this one=(FAIL) domain=some.host
 checking domains
 some.host in "test.ex"? no (end of list)
 some.host in "! +local_domains"? yes (end of list)
 calling q router
-q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some.host
+q router called for "FAIL cannot route this one=(FAIL)"@some.host: domain = some.host
 requires uid=CALLER_UID gid=CALLER_GID current_directory=/
 not running as root: cannot change uid/gid
 subprocess will run with uid=EXIM_UID gid=EXIM_GID
-command wrote: FAIL cannot route this one (FAIL)
+command wrote: FAIL cannot route this one=(FAIL)
 q router forced address failure
 ----------- end verify ------------
 accept: condition test failed in inline ACL
 end of inline ACL: implicit DENY
 LOG: MAIN REJECT
-  H=(some.name) [V4NET.2.3.4] F=<x@y> rejected RCPT <"FAIL cannot route this one (FAIL)"@some.host>: cannot route this one (FAIL)
+  H=(some.name) [V4NET.2.3.4] F=<x@y> rejected RCPT <"FAIL cannot route this one=(FAIL)"@some.host>: cannot route this one=(FAIL)
 LOG: smtp_connection MAIN
   SMTP connection from (some.name) [V4NET.2.3.4] closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>