[exim-cvs] Move DSN support to mainline

Author: Exim Git Commits Mailing List
Date:
To: exim-cvs
Subject: [exim-cvs] Move DSN support to mainline

Gitweb: http://git.exim.org/exim.git/commitdiff/50dc740948ba43eaeb6d33757bc83beff33f2a64

Commit:     50dc740948ba43eaeb6d33757bc83beff33f2a64
Parent:     e0eb00cd78f2dbf91aba5dffa579177b1e1815a1
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Dec 23 20:07:16 2014 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon Jan 12 18:58:35 2015 +0000

    Move DSN support to mainline
    Affects bug 893
---
 doc/doc-docbook/spec.xfpt                        |   42 +-
 doc/doc-txt/ChangeLog                            |    7 +
 doc/doc-txt/experimental-spec.txt                |   60 -
 src/exim_monitor/em_globals.c                    |    2 -
 src/src/EDITME                                   |    3 -
 src/src/config.h.defaults                        |    1 -
 src/src/deliver.c                                |  121 +-
 src/src/exim.c                                   |    5 -
 src/src/globals.c                                |    6 -
 src/src/globals.h                                |    2 -
 src/src/local_scan.h                             |    2 -
 src/src/macros.h                                 |    2 -
 src/src/readconf.c                               |    2 -
 src/src/receive.c                                |    2 -
 src/src/route.c                                  |   10 +-
 src/src/smtp_in.c                                |   28 +-
 src/src/spool_in.c                               |   16 +-
 src/src/spool_out.c                              |   17 +-
 src/src/structs.h                                |    4 -
 src/src/transport.c                              |    2 -
 src/src/transports/smtp.c                        |   18 -
 test/mail/0015.CALLER                            |   38 +-
 test/mail/0032.CALLER                            |   19 +-
 test/mail/0037.CALLER                            |  177 ++-
 test/mail/0048.CALLER                            |   95 +-
 test/mail/0051.CALLER                            |   76 +-
 test/mail/0052.CALLER                            |   38 +-
 test/mail/0098.CALLER                            |  213 ++
 test/mail/0103.CALLER                            |   38 +-
 test/mail/0136.forwarder                         |   38 +-
 test/mail/0140.CALLER                            |   19 +-
 test/mail/0142.CALLER                            |   19 +-
 test/mail/0164.CALLER                            |   38 +-
 test/mail/0165.CALLER                            |   38 +-
 test/mail/0174.CALLER                            |   19 +-
 test/mail/0176.CALLER                            |   19 +-
 test/mail/0177.CALLER                            |   19 +-
 test/mail/0194.CALLER                            |   87 +-
 test/mail/0211.CALLER                            |   47 +-
 test/mail/0224.CALLER                            |   57 +-
 test/mail/0226.CALLER                            |   41 +-
 test/mail/0237.CALLER                            |   41 +-
 test/mail/0253.lmn                               |   21 +-
 test/mail/0256.CALLER                            |   19 +-
 test/mail/0256.abc@def                           |   19 +-
 test/mail/0256.abcd+test.ex+xxxx                 |   19 +-
 "test/mail/0256.abcd+unknown.domain+\"abc@def\"" |   19 +-
 test/mail/0266.CALLER                            |   19 +-
 test/mail/0270.CALLER                            |   19 +-
 test/mail/0280.CALLER                            |   38 +-
 test/mail/0283.CALLER                            |   19 +-
 test/mail/0296.CALLER                            |   19 +-
 test/mail/0298.CALLER                            |   38 +-
 test/mail/0306.anyone                            |   38 +-
 test/mail/0307.anyone                            |   38 +-
 test/mail/0309.CALLER                            |   25 +-
 test/mail/0310.CALLER                            |   29 +
 test/mail/0321.CALLER                            |   19 +-
 test/mail/0374.CALLER                            |   24 +-
 test/mail/0375.CALLER                            |   21 +-
 test/mail/0383.CALLER                            |   57 +-
 test/mail/0385.CALLER                            |  243 +--
 test/mail/0428.CALLER                            |   38 +-
 test/mail/0452.CALLER                            |   19 +-
 test/mail/0461.CALLER                            |   57 +-
 test/mail/0508.postmaster                        |   19 +-
 test/mail/0522.CALLER                            |   38 +-
 test/mail/0531.CALLER                            |   63 +-
 test/mail/0536.oksender                          |   19 +-
 test/mail/5101.copied                            |   38 +-
 test/mail/5204.CALLER                            |   19 +-
 test/runtest                                     |    2 +-
 test/stderr/0022                                 |    6 +
 test/stderr/0037                                 |   12 +
 test/stderr/0038                                 |    6 +
 test/stderr/0043                                 |    1 +
 test/stderr/0044                                 |    2 +
 test/stderr/0070                                 |    1 +
 test/stderr/0078                                 |   12 +
 test/stderr/0079                                 |    1 +
 test/stderr/0080                                 |    1 +
 test/stderr/0084                                 |    3 +
 test/stderr/0085                                 |    6 +
 test/stderr/0094                                 |    2 +
 test/stderr/0117                                 |    3 +
 test/stderr/0123                                 |    6 +
 test/stderr/0138                                 |    2 +
 test/stderr/0143                                 |    1 +
 test/stderr/0149                                 |    3 +
 test/stderr/0161                                 |   30 +
 test/stderr/0180                                 |    2 +
 test/stderr/0183                                 |   12 +
 test/stderr/0243                                 |    1 +
 test/stderr/0275                                 |   41 +
 test/stderr/0278                                 |   34 +
 test/stderr/0279                                 |    8 +
 test/stderr/0294                                 |   10 +
 test/stderr/0297                                 |    2 +
 test/stderr/0303                                 |    5 +
 test/stderr/0315                                 |    8 +
 test/stderr/0332                                 |    4 +
 test/stderr/0333                                 |    4 +
 test/stderr/0360                                 |    9 +
 test/stderr/0361                                 |   30 +
 test/stderr/0362                                 |    3 +
 test/stderr/0364                                 |    5 +
 test/stderr/0371                                 |    2 +
 test/stderr/0374                                 |   20 +
 test/stderr/0375                                 |   54 +
 test/stderr/0377                                 |   32 +
 test/stderr/0378                                 |   20 +
 test/stderr/0379                                 |    9 +
 test/stderr/0380                                 |    8 +
 test/stderr/0381                                 |    1 +
 test/stderr/0384                                 |    1 +
 test/stderr/0386                                 |   34 +
 test/stderr/0388                                 |   10 +
 test/stderr/0391                                 |    2 +
 test/stderr/0398                                 |    4 +
 test/stderr/0399                                 |    3 +
 test/stderr/0402                                 |   88 +
 test/stderr/0403                                 |   24 +
 test/stderr/0404                                 | 2472 ++++++++++++++++++++++
 test/stderr/0408                                 |   16 +
 test/stderr/0414                                 |    3 +
 test/stderr/0419                                 |    1 +
 test/stderr/0420                                 |    2 +
 test/stderr/0426                                 |    8 +
 test/stderr/0432                                 |    2 +
 test/stderr/0463                                 |    1 +
 test/stderr/0464                                 |    3 +
 test/stderr/0465                                 |    6 +
 test/stderr/0469                                 |    1 +
 test/stderr/0471                                 |    4 +
 test/stderr/0476                                 |    1 +
 test/stderr/0479                                 |    3 +
 test/stderr/0483                                 |    1 +
 test/stderr/0487                                 |   18 +
 test/stderr/0499                                 |    1 +
 test/stderr/0513                                 |    1 +
 test/stderr/0514                                 |    1 +
 test/stderr/0524                                 |    4 +
 test/stderr/0537                                 |    1 +
 test/stderr/0543                                 |    1 +
 test/stderr/0545                                 |    2 +
 test/stderr/0563                                 |    2 +
 test/stderr/2201                                 |    2 +
 test/stderr/2600                                 |   20 +
 test/stderr/3000                                 |    1 +
 test/stderr/3208                                 |    1 +
 test/stderr/3210                                 |    1 +
 test/stderr/3400                                 |    6 +
 test/stderr/3408                                 |    2 +
 test/stderr/3410                                 |    3 +
 test/stderr/3500                                 |    3 +
 test/stderr/5004                                 |   24 +
 test/stderr/5005                                 |   56 +
 test/stderr/5006                                 |   16 +
 test/stderr/5204                                 |   49 +-
 test/stderr/5400                                 |    1 +
 test/stderr/5410                                 |    3 +
 test/stderr/5420                                 |    3 +
 test/stdout/0147                                 |    1 +
 test/stdout/0338                                 |    2 +-
 test/stdout/0442                                 |    1 +
 test/stdout/3412                                 |   19 +-
 test/stdout/5204                                 |    2 +-
 167 files changed, 5388 insertions(+), 554 deletions(-)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 3419b76..aece633 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -3811,6 +3811,12 @@ This option is not intended for use by external callers. It is used internally
by Exim in conjunction with the &%-MC%& option. It signifies that the
connection to the remote host has been authenticated.

+.vitem &%-MCD%&
+.oindex "&%-MCD%&"
+This option is not intended for use by external callers. It is used internally
+by Exim in conjunction with the &%-MC%& option. It signifies that the
+remote host supports the ESMTP &_DSN_& extension.
+
 .vitem &%-MCP%&
 .oindex "&%-MCP%&"
 This option is not intended for use by external callers. It is used internally
@@ -13409,6 +13415,7 @@ See also the &'Policy controls'& section above.
 .table2
 .row &%accept_8bitmime%&             "advertise 8BITMIME"
 .row &%auth_advertise_hosts%&        "advertise AUTH to these hosts"
+.row &%dsn_advertise_hosts%&         "advertise DSN extensions to these hosts"
 .row &%ignore_fromline_hosts%&       "allow &""From ""& from these hosts"
 .row &%ignore_fromline_local%&       "allow &""From ""& from local SMTP"
 .row &%pipelining_advertise_hosts%&  "advertise pipelining to these hosts"
@@ -14150,6 +14157,18 @@ This is an obsolete option that is now a no-op. It used to affect the way Exim
 handled CR and LF characters in incoming messages. What happens now is
 described in section &<<SECTlineendings>>&.

+.option dsn_advertise_hosts main "host list&!!" unset
+.cindex "bounce messages" "success"
+.cindex "DSN" "success"
+.cindex "Delivery Status Notification" "success"
+DSN extensions (RFC3461) will be advertised in the EHLO message to,
+and accepted from, these hosts.
+Hosts may use the NOTIFY and ENVID options on RCPT TO commands,
+and RET and ORCPT options on MAIL FROM commands.
+A NOTIFY=SUCCESS option requests success-DSN messages.
+A NOTIFY= option with no argument requests that no delay or failure DSNs
+are sent.
+
.option dsn_from main "string&!!" "see below"
.cindex "&'From:'& header line" "in bounces"
.cindex "bounce messages" "&'From:'& line, specifying"
@@ -16981,6 +17000,15 @@ This option must always be set. It specifies which of the available routers is
to be used.

+.option dsn_lasthop routers boolean false
+.cindex "DSN" "success"
+.cindex "Delivery Status Notification" "success"
+If this option is set true, and extended DSN (RFC3461) processing is in effect,
+Exim will not pass on DSN requests to downstream DSN-aware hosts but will
+instead send a success DSN as if the next hop does not support DSN.
+Not effective on redirect routers.
+
+

.option errors_to routers string&!! unset
.cindex "envelope sender"
@@ -18987,6 +19015,11 @@ However, there are some private options which define transports for delivery to
files and pipes, and for generating autoreplies. See the &%file_transport%&,
&%pipe_transport%& and &%reply_transport%& descriptions below.

+If success DSNs have been requested
+.cindex "DSN" "success"
+.cindex "Delivery Status Notification" "success"
+redirection triggers one and the DSN options are not passed any further.
+

.section "Redirection data" "SECID124"
@@ -33471,13 +33504,8 @@ failing addresses with their error messages.
The third item is used to introduce any text from pipe transports that is to be
returned to the sender. It is omitted if there is no such text.
.next
-The fourth item is used to introduce the copy of the message that is returned
-as part of the error report.
-.next
-The fifth item is added after the fourth one if the returned message is
-truncated because it is bigger than &%return_size_limit%&.
-.next
-The sixth item is added after the copy of the original message.
+The fourth, fifth and sixth items will be ignored and may be empty.
+The fields exist for back-compatibility
.endlist

 The default state (&%bounce_message_file%& unset) is equivalent to the
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index cef9c16..4dad461 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -29,6 +29,13 @@ JH/06 Verification of the server certificate for a TLS connection is now tried
 JH/07 Changed the default rfc1413 lookup settings to disable calls.  Few
       sites use this now.

+JH/08 The EXPERIMENTAL_DSN compile option is no longer needed; all Delivery
+      Status Notification (bounce) messages are now MIME format per RFC 3464.
+      Support for RFC 3461 DSN options NOTIFY,ENVID,RET,ORCPT can be advertised
+      under the control of the dsn_advertise_hosts option, and routers may
+      have a dsn_lasthop option.
+
+

Exim version 4.85
-----------------
diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt
index 4bcfecf..bdab748 100644
--- a/doc/doc-txt/experimental-spec.txt
+++ b/doc/doc-txt/experimental-spec.txt
@@ -1084,66 +1084,6 @@ QUIT
221 mail.example.net closing connection

-DSN Support
---------------------------------------------------------------
-
-DSN Support tries to add RFC 3461 support to Exim. It adds support for
-*) the additional parameters for MAIL FROM and RCPT TO
-*) RFC complient MIME DSN messages for all of
- success, failure and delay notifications
-*) dsn_advertise_hosts main option to select which hosts are able
- to use the extension
-*) dsn_lasthop router switch to end DSN processing
-
-In case of failure reports this means that the last three parts, the message body
-intro, size info and final text, of the defined template are ignored since there is no
-logical place to put them in the MIME message.
-
-All the other changes are made without changing any defaults
-
-Building exim:
---------------
-
-Define
-EXPERIMENTAL_DSN=YES
-in your Local/Makefile.
-
-Configuration:
---------------
-All DSNs are sent in MIME format if you built exim with EXPERIMENTAL_DSN=YES
-No option needed to activate it, and no way to turn it off.
-
-Failure and delay DSNs are triggered as usual except a sender used NOTIFY=...
-to prevent them.
-
-Support for Success DSNs is added and activated by NOTIFY=SUCCESS by clients.
-
-Add
-dsn_advertise_hosts = *
-or a more restrictive host_list to announce DSN in EHLO answers
-
-Those hosts can then use NOTIFY,ENVID,RET,ORCPT options.
-
-If a message is relayed to a DSN aware host without changing the envelope
-recipient the options are passed along and no success DSN is generated.
-
-A redirect router will always trigger a success DSN if requested and the DSN
-options are not passed any further.
-
-A success DSN always contains the recipient address as submitted by the
-client as required by RFC. Rewritten addresses are never exposed.
-
-If you used DSN patch up to 1.3 before remove all "dsn_process" switches from
-your routers since you don't need them anymore. There is no way to "gag"
-success DSNs anymore. Announcing DSN means answering as requested.
-
-You can prevent Exim from passing DSN options along to other DSN aware hosts by defining
-dsn_lasthop
-in a router. Exim will then send the success DSN himself if requested as if
-the next hop does not support DSN.
-Adding it to a redirect router makes no difference.
-
-

 DANE
diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c
index 918659d..3277012 100644
--- a/src/exim_monitor/em_globals.c
+++ b/src/exim_monitor/em_globals.c
@@ -145,10 +145,8 @@ BOOL    dkim_disable_verify      = FALSE;

 BOOL    dont_deliver           = FALSE;

-#ifdef EXPERIMENTAL_DSN
 int     dsn_ret                = 0;
 uschar *dsn_envid              = NULL;
-#endif

 #ifdef WITH_CONTENT_SCAN
 int     fake_response          = OK;
diff --git a/src/src/EDITME b/src/src/EDITME
index 4a290a4..353dde3 100644
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -491,9 +491,6 @@ EXIM_MONITOR=eximon.bin
 # ownership
 # EXPERIMENTAL_CERTNAMES=yes

-# Uncomment the following line to add DSN support
-# EXPERIMENTAL_DSN=yes
-
# Uncomment the following line to add DANE support
# EXPERIMENTAL_DANE=yes

diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults
index ec4322c..e339bdf 100644
--- a/src/src/config.h.defaults
+++ b/src/src/config.h.defaults
@@ -170,7 +170,6 @@ it's a default value. */
#define EXPERIMENTAL_DANE
#define EXPERIMENTAL_DCC
#define EXPERIMENTAL_DMARC
-#define EXPERIMENTAL_DSN
#define EXPERIMENTAL_PROXY
#define EXPERIMENTAL_REDIS
#define EXPERIMENTAL_SPF
diff --git a/src/src/deliver.c b/src/src/deliver.c
index 5000f1c..462aaf4 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -63,10 +63,8 @@ static address_item *addr_new = NULL;
static address_item *addr_remote = NULL;
static address_item *addr_route = NULL;
static address_item *addr_succeed = NULL;
-#ifdef EXPERIMENTAL_DSN
static address_item *addr_dsntmp = NULL;
static address_item *addr_senddsn = NULL;
-#endif

 static FILE *message_log = NULL;
 static BOOL update_spool;
@@ -3166,14 +3164,12 @@ while (!done)
     break;
 #endif

-#ifdef EXPERIMENTAL_DSN
     case 'D':
     if (addr == NULL) goto ADDR_MISMATCH;
     memcpy(&(addr->dsn_aware), ptr, sizeof(addr->dsn_aware));
     ptr += sizeof(addr->dsn_aware);
     DEBUG(D_deliver) debug_printf("DSN read: addr->dsn_aware = %d\n", addr->dsn_aware);
     break;
-#endif

     case 'A':
     if (addr == NULL)
@@ -4370,11 +4366,9 @@ for (delivery_count = 0; addr_remote != NULL; delivery_count++)
     rmt_dlv_checked_write(fd, 'P', '0', NULL, 0);
 #endif

-#ifdef EXPERIMENTAL_DSN
       memcpy(big_buffer, &addr->dsn_aware, sizeof(addr->dsn_aware));
       rmt_dlv_checked_write(fd, 'D', '0', big_buffer, sizeof(addr->dsn_aware));
       DEBUG(D_deliver) debug_printf("DSN write: addr->dsn_aware = %d\n", addr->dsn_aware);
-#endif

       /* Retry information: for most success cases this will be null. */

@@ -4814,7 +4808,6 @@ while (*s != 0)
}

-#ifdef EXPERIMENTAL_DSN
 /***********************************************************
 *         Print Diagnostic-Code for an address             *
 ************************************************************/
@@ -4863,7 +4856,6 @@ while (*s)

fputc('\n', f);
}
-#endif /* EXPERIMENTAL_DSN */

 /*************************************************
@@ -5577,13 +5569,11 @@ if (process_recipients != RECIP_IGNORE)
       if (r->pno >= 0)
         new->onetime_parent = recipients_list[r->pno].address;

-#ifdef EXPERIMENTAL_DSN
       /* If DSN support is enabled, set the dsn flags and the original receipt 
          to be passed on to other DSN enabled MTAs */
       new->dsn_flags = r->dsn_flags & rf_dsnflags;
       new->dsn_orcpt = r->orcpt;
       DEBUG(D_deliver) debug_printf("DSN: set orcpt: %s  flags: %d\n", new->dsn_orcpt, new->dsn_flags);
-#endif

       switch (process_recipients)
         {
@@ -6548,11 +6538,9 @@ if (addr_remote != NULL)
     regex_must_compile(US"\\n250[\\s\\-]PRDR(\\s|\\n|$)", FALSE, TRUE);
 #endif

-#ifdef EXPERIMENTAL_DSN
   /* Set the regex to check for DSN support on remote MTA */
   if (regex_DSN == NULL) regex_DSN  =
     regex_must_compile(US"\\n250[\\s\\-]DSN(\\s|\\n|$)", FALSE, TRUE);
-#endif

/* Now sort the addresses if required, and do the deliveries. The yield of
do_remote_deliveries is FALSE when mua_wrapper is set and all addresses
@@ -6661,7 +6649,6 @@ prevents actual delivery. */

else if (!dont_deliver) retry_update(&addr_defer, &addr_failed, &addr_succeed);

-#ifdef EXPERIMENTAL_DSN
 /* Send DSN for successful messages */
 addr_dsntmp = addr_succeed;
 addr_senddsn = NULL;
@@ -6820,7 +6807,6 @@ if (addr_senddsn != NULL)
     rc = child_close(pid, 0);     /* Waits for child to close, no timeout */
     }
   }
-#endif    /*EXPERIMENTAL_DSN*/

/* If any addresses failed, we must send a message to somebody, unless
af_ignore_error is set, in which case no action is taken. It is possible for
@@ -6879,11 +6865,9 @@ while (addr_failed != NULL)
it from the list, throw away any saved message file, log it, and
mark the recipient done. */

-  if (testflag(addr_failed, af_ignore_error)
-#ifdef EXPERIMENTAL_DSN
-      || (((addr_failed->dsn_flags & rf_dsnflags) != 0)
-         && ((addr_failed->dsn_flags & rf_notify_failure) != rf_notify_failure))
-#endif
+  if (  testflag(addr_failed, af_ignore_error)
+     || (  ((addr_failed->dsn_flags & rf_dsnflags) != 0)
+        && ((addr_failed->dsn_flags & rf_notify_failure) != rf_notify_failure))
      )
   {
     addr = addr_failed;
@@ -6937,12 +6921,10 @@ while (addr_failed != NULL)
       BOOL to_sender = strcmpic(sender_address, bounce_recipient) == 0;
       int max = (bounce_return_size_limit/DELIVER_IN_BUFFER_SIZE + 1) *
         DELIVER_IN_BUFFER_SIZE;
-#ifdef EXPERIMENTAL_DSN
       uschar * bound;
       uschar *dsnlimitmsg;
       uschar *dsnnotifyhdr;
       int topt;
-#endif

       DEBUG(D_deliver)
         debug_printf("sending error message to: %s\n", bounce_recipient);
@@ -6996,7 +6978,6 @@ while (addr_failed != NULL)
       moan_write_from(f);
       fprintf(f, "To: %s\n", bounce_recipient);

-#ifdef EXPERIMENTAL_DSN
       /* generate boundary string and output MIME-Headers */
       bound = string_sprintf(TIME_T_FMT "-eximdsn-%d", time(NULL), rand());

@@ -7004,7 +6985,6 @@ while (addr_failed != NULL)
         " report-type=delivery-status; boundary=%s\n"
       "MIME-Version: 1.0\n",
     bound);
-#endif

       /* Open a template file if one is provided. Log failure to open, but
       carry on - default texts will be used. */
@@ -7029,12 +7009,10 @@ while (addr_failed != NULL)
         fprintf(f, "Subject: Mail delivery failed%s\n\n",
           to_sender? ": returning message to sender" : "");

-#ifdef EXPERIMENTAL_DSN
       /* output human readable part as text/plain section */
       fprintf(f, "--%s\n"
       "Content-type: text/plain; charset=us-ascii\n\n",
     bound);
-#endif

       if ((emf_text = next_emf(emf, US"intro")))
     fprintf(f, "%s", CS emf_text);
@@ -7161,7 +7139,6 @@ wording. */
     fputc('\n', f);
         }

-#ifdef EXPERIMENTAL_DSN
       /* output machine readable part */
       fprintf(f, "--%s\n"
       "Content-type: message/delivery-status\n\n"
@@ -7192,7 +7169,6 @@ wording. */
           print_dsn_diagnostic_code(addr, f);
           }
         }
-#endif

       /* Now copy the message, trying to give an intelligible comment if
       it is too long for it all to be copied. The limit isn't strictly
@@ -7201,65 +7177,6 @@ wording. */

       emf_text = next_emf(emf, US"copy");

-#ifndef EXPERIMENTAL_DSN
-      if (bounce_return_message)
-        {
-        int topt = topt_add_return_path;
-        if (!bounce_return_body) topt |= topt_no_body;
-
-        if (emf_text)
-      fprintf(f, "%s", CS emf_text);
-    else
-          {
-          if (bounce_return_body) fprintf(f,
-"------ This is a copy of the message, including all the headers. ------\n");
-          else fprintf(f,
-"------ This is a copy of the message's headers. ------\n");
-          }
-
-        /* While reading the "truncated" message, set return_size_limit to
-        the actual max testing value, rounded. We need to read the message
-        whether we are going to use it or not. */
-
-          {
-          int temp = bounce_return_size_limit;
-          bounce_return_size_limit = (max/1000)*1000;
-          emf_text = next_emf(emf, US"truncated");
-          bounce_return_size_limit = temp;
-          }
-
-        if (bounce_return_body && bounce_return_size_limit > 0)
-          {
-          struct stat statbuf;
-          if (fstat(deliver_datafile, &statbuf) == 0 && statbuf.st_size > max)
-        {
-            if (emf_text)
-          fprintf(f, "%s", CS emf_text);
-        else
-              fprintf(f,
-"------ The body of the message is " OFF_T_FMT " characters long; only the first\n"
-"------ %d or so are included here.\n", statbuf.st_size, max);
-        }
-          }
-
-    fputc('\n', f);
-        fflush(f);
-
-        transport_filter_argv = NULL;   /* Just in case */
-        return_path = sender_address;   /* In case not previously set */
-        transport_write_message(NULL, fileno(f), topt,
-          bounce_return_size_limit, NULL, NULL, NULL, NULL, NULL, 0);
-        }
-
-      /* Write final text and close the template file if one is open */
-
-      if (emf)
-        {
-        if ((emf_text = next_emf(emf, US"final")))
-      fprintf(f, "%s", CS emf_text);
-        (void)fclose(emf);
-        }
-#else
       /* add message body
          we ignore the intro text from template and add 
          the text for bounce_return_size_limit at the end.
@@ -7317,7 +7234,6 @@ wording. */
         (void)fclose(emf);

       fprintf(f, "\n--%s--\n", bound);
-#endif    /*EXPERIMENTAL_DSN*/

       /* Close the file, which should send an EOF to the child process
       that is receiving the message. Wait for it to finish. */
@@ -7552,15 +7468,18 @@ else if (addr_defer != (address_item *)(+1))
   is not sent. Another attempt will be made at the next delivery attempt (if
   it also defers). */

-  if (!queue_2stage && delivery_attempted &&
-#ifdef EXPERIMENTAL_DSN
-      (((addr_defer->dsn_flags & rf_dsnflags) == 0) ||
-       (addr_defer->dsn_flags & rf_notify_delay) == rf_notify_delay) &&
-#endif
-      delay_warning[1] > 0 && sender_address[0] != 0 &&
-       (delay_warning_condition == NULL ||
-          expand_check_condition(delay_warning_condition,
-            US"delay_warning", US"option")))
+  if (  !queue_2stage
+     && delivery_attempted
+     && (  ((addr_defer->dsn_flags & rf_dsnflags) == 0)
+        || (addr_defer->dsn_flags & rf_notify_delay) == rf_notify_delay
+    )
+     && delay_warning[1] > 0
+     && sender_address[0] != 0
+     && (  delay_warning_condition == NULL
+        || expand_check_condition(delay_warning_condition,
+            US"delay_warning", US"option")
+    )
+     )
     {
     int count;
     int show_time;
@@ -7621,9 +7540,7 @@ else if (addr_defer != (address_item *)(+1))
         uschar *wmf_text;
         FILE *wmf = NULL;
         FILE *f = fdopen(fd, "wb");
-#ifdef EXPERIMENTAL_DSN
     uschar * bound;
-#endif

         if (warn_message_file)
           {
@@ -7644,7 +7561,6 @@ else if (addr_defer != (address_item *)(+1))
         moan_write_from(f);
         fprintf(f, "To: %s\n", recipients);

-#ifdef EXPERIMENTAL_DSN
         /* generated boundary string and output MIME-Headers */
         bound = string_sprintf(TIME_T_FMT "-eximdsn-%d", time(NULL), rand());

@@ -7652,7 +7568,6 @@ else if (addr_defer != (address_item *)(+1))
         " report-type=delivery-status; boundary=%s\n"
         "MIME-Version: 1.0\n",
       bound);
-#endif

         if ((wmf_text = next_emf(wmf, US"header")))
           fprintf(f, "%s\n", wmf_text);
@@ -7660,12 +7575,10 @@ else if (addr_defer != (address_item *)(+1))
           fprintf(f, "Subject: Warning: message %s delayed %s\n\n",
             message_id, warnmsg_delay);

-#ifdef EXPERIMENTAL_DSN
         /* output human readable part as text/plain section */
         fprintf(f, "--%s\n"
         "Content-type: text/plain; charset=us-ascii\n\n",
       bound);
-#endif

         if ((wmf_text = next_emf(wmf, US"intro")))
       fprintf(f, "%s", CS wmf_text);
@@ -7704,10 +7617,8 @@ else if (addr_defer != (address_item *)(+1))

         /* List the addresses, with error information if allowed */

-#ifdef EXPERIMENTAL_DSN
         /* store addr_defer for machine readable part */
         address_item *addr_dsndefer = addr_defer;
-#endif
         fputc('\n', f);
         while (addr_defer)
           {
@@ -7736,7 +7647,6 @@ else if (addr_defer != (address_item *)(+1))
 "and when that happens, the message will be returned to you.\n");
           }

-#ifdef EXPERIMENTAL_DSN
         /* output machine readable part */
         fprintf(f, "\n--%s\n"
         "Content-type: message/delivery-status\n\n"
@@ -7789,7 +7699,6 @@ else if (addr_defer != (address_item *)(+1))
         fprintf(f,"\n--%s--\n", bound);

         fflush(f);
-#endif    /*EXPERIMENTAL_DSN*/

         /* Close and wait for child process to complete, without a timeout.
         If there's an error, don't update the count. */
diff --git a/src/src/exim.c b/src/src/exim.c
index e0b7546..33c2a90 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -853,9 +853,6 @@ fprintf(f, "Support for:");
 #ifdef EXPERIMENTAL_REDIS
   fprintf(f, " Experimental_Redis");
 #endif
-#ifdef EXPERIMENTAL_DSN
-  fprintf(f, " Experimental_DSN");
-#endif
 fprintf(f, "\n");

 fprintf(f, "Lookups (built-in):");
@@ -2678,7 +2675,6 @@ for (i = 1; i < argc; i++)
       break;
       }

-    #ifdef EXPERIMENTAL_DSN
     /* -MCD: set the smtp_use_dsn flag; this indicates that the host
        that exim is connected to supports the esmtp extension DSN */
     else if (Ustrcmp(argrest, "CD") == 0)
@@ -2686,7 +2682,6 @@ for (i = 1; i < argc; i++)
       smtp_use_dsn = TRUE;
       break;
       }
-    #endif

     /* -MCP: set the smtp_use_pipelining flag; this is useful only when
     it preceded -MC (see above) */
diff --git a/src/src/globals.c b/src/src/globals.c
index 8cdfb0e..85d2e5c 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -134,13 +134,11 @@ tls_support tls_out = {
  0     /* tls_ocsp */
 };

-#ifdef EXPERIMENTAL_DSN
 uschar *dsn_envid              = NULL;
 int     dsn_ret                = 0;
 const pcre  *regex_DSN         = NULL;
 BOOL    smtp_use_dsn           = FALSE;
 uschar *dsn_advertise_hosts    = NULL;
-#endif

 #ifdef SUPPORT_TLS
 BOOL    gnutls_compat_mode     = FALSE;
@@ -361,11 +359,9 @@ address_item address_defaults = {
   NULL,            /* authenticator */
   NULL,            /* auth_id */
   NULL,            /* auth_sndr */
-  #ifdef EXPERIMENTAL_DSN
   NULL,                 /* dsn_orcpt */
   0,                    /* dsn_flags */
   0,                    /* dsn_aware */
-  #endif
   (uid_t)(-1),          /* uid */
   (gid_t)(-1),          /* gid */
   0,                    /* flags */
@@ -1149,9 +1145,7 @@ router_instance  router_defaults = {
     TRUE,                      /* verify_sender */
     FALSE,                     /* uid_set */
     FALSE,                     /* unseen */
-#ifdef EXPERIMENTAL_DSN
     FALSE,                     /* dsn_lasthop */
-#endif

     self_freeze,               /* self_code */
     (uid_t)(-1),               /* uid */
diff --git a/src/src/globals.h b/src/src/globals.h
index 5746167..7ca07d5 100644
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -130,13 +130,11 @@ extern uschar *tls_verify_certificates;/* Path for certificates to check */
 extern uschar *tls_verify_hosts;       /* Mandatory client verification */
 #endif

-#ifdef EXPERIMENTAL_DSN
 extern uschar  *dsn_envid;             /* DSN envid string */
 extern int      dsn_ret;               /* DSN ret type*/
 extern const pcre  *regex_DSN;         /* For recognizing DSN settings */
 extern BOOL     smtp_use_dsn;          /* Global for passed connections */
 extern uschar  *dsn_advertise_hosts;   /* host for which TLS is advertised */
-#endif

 /* Input-reading functions for messages, so we can use special ones for
 incoming TCP/IP. */
diff --git a/src/src/local_scan.h b/src/src/local_scan.h
index 6df601a..5bd335e 100644
--- a/src/src/local_scan.h
+++ b/src/src/local_scan.h
@@ -128,10 +128,8 @@ typedef struct recipient_item {
   uschar *address;              /* the recipient address */
   int     pno;                  /* parent number for "one_time" alias, or -1 */
   uschar *errors_to;            /* the errors_to address or NULL */
-#ifdef EXPERIMENTAL_DSN
   uschar *orcpt;                /* DSN orcpt */
   int     dsn_flags;            /* DSN flags */
-#endif
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   uschar *bmi_optin;
 #endif
diff --git a/src/src/macros.h b/src/src/macros.h
index 67e804f..2a49c1d 100644
--- a/src/src/macros.h
+++ b/src/src/macros.h
@@ -793,7 +793,6 @@ enum {
 #define topt_no_body            0x040  /* Omit body */
 #define topt_escape_headers     0x080  /* Apply escape check to headers */

-#ifdef EXPERIMENTAL_DSN
/* Flags for recipient_block, used in DSN support */

 #define rf_dsnlasthop           0x01  /* Do not propagate DSN any further */
@@ -814,7 +813,6 @@ enum {
 #define dsn_support_yes         1
 #define dsn_support_no          2

-#endif

/* Codes for the host_find_failed and host_all_ignored options. */

diff --git a/src/src/readconf.c b/src/src/readconf.c
index df4cbb2..0b37780 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -229,9 +229,7 @@ static optionlist optionlist_config[] = {
  /* This option is now a no-op, retained for compability */
   { "drop_cr",                  opt_bool,        &drop_cr },
 /*********************************************************/
-#ifdef EXPERIMENTAL_DSN
   { "dsn_advertise_hosts",      opt_stringptr,   &dsn_advertise_hosts },
-#endif
   { "dsn_from",                 opt_stringptr,   &dsn_from },
   { "envelope_to_remove",       opt_bool,        &envelope_to_remove },
   { "errors_copy",              opt_stringptr,   &errors_copy },
diff --git a/src/src/receive.c b/src/src/receive.c
index 0466cab..8ab3166 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -497,10 +497,8 @@ recipients_list[recipients_count].bmi_optin = bmi_current_optin;
 /* reset optin string pointer for next recipient */
 bmi_current_optin = NULL;
 #endif
-#ifdef EXPERIMENTAL_DSN
 recipients_list[recipients_count].orcpt = NULL;
 recipients_list[recipients_count].dsn_flags = 0;
-#endif
 recipients_list[recipients_count++].errors_to = NULL;
 }

diff --git a/src/src/route.c b/src/src/route.c
index c640e9e..0950304 100644
--- a/src/src/route.c
+++ b/src/src/route.c
@@ -58,10 +58,8 @@ optionlist optionlist_routers[] = {
                  (void *)offsetof(router_instance, domains) },
   { "driver",             opt_stringptr|opt_public,
                  (void *)offsetof(router_instance, driver_name) },
-  #ifdef EXPERIMENTAL_DSN
   { "dsn_lasthop",        opt_bool|opt_public,
                  (void *)offsetof(router_instance, dsn_lasthop) },
-  #endif
   { "errors_to",          opt_stringptr|opt_public,
                  (void *)(offsetof(router_instance, errors_to)) },
   { "expn",               opt_bool|opt_public,
@@ -275,14 +273,12 @@ for (r = routers; r != NULL; r = r->next)
   if (r->pass_router_name != NULL)
     set_router(r, r->pass_router_name, &(r->pass_router), TRUE);

-  #ifdef EXPERIMENTAL_DSN
-    DEBUG(D_route) {
+  DEBUG(D_route) {
       if (r->dsn_lasthop == FALSE)
         debug_printf("DSN: %s propagating DSN\n", r->name);
       else
         debug_printf("DSN: %s lasthop set\n", r->name);
       }
-  #endif
   }
 }

@@ -1364,10 +1360,8 @@ new->p.errors_address = parent->p.errors_address;

copyflag(new, addr, af_propagate);
new->p.address_data = addr->p.address_data;
-#ifdef EXPERIMENTAL_DSN
new->dsn_flags = addr->dsn_flags;
new->dsn_orcpt = addr->dsn_orcpt;
-#endif

/* As it has turned out, we haven't set headers_add or headers_remove for the
@@ -1675,7 +1669,6 @@ for (r = (addr->start_router == NULL)? routers : addr->start_router;

/* Run the router, and handle the consequences. */

-#ifdef EXPERIMENTAL_DSN
 /* ... but let us check on DSN before. If this should be the last hop for DSN
    set flag
 */
@@ -1684,7 +1677,6 @@ for (r = (addr->start_router == NULL)? routers : addr->start_router;
     addr->dsn_flags |= rf_dsnlasthop;
     HDEBUG(D_route) debug_printf("DSN: last hop for %s\n", addr->address);
   }
-#endif

HDEBUG(D_route) debug_printf("calling %s router\n", r->name);

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 54dcaa5..d646fe0 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -121,9 +121,7 @@ static BOOL auth_advertised;
 #ifdef SUPPORT_TLS
 static BOOL tls_advertised;
 #endif
-#ifdef EXPERIMENTAL_DSN
 static BOOL dsn_advertised;
-#endif
 static BOOL esmtp;
 static BOOL helo_required = FALSE;
 static BOOL helo_verify = FALSE;
@@ -220,9 +218,7 @@ enum {
 #ifndef DISABLE_PRDR
   ENV_MAIL_OPT_PRDR,
 #endif
-#ifdef EXPERIMENTAL_DSN
   ENV_MAIL_OPT_RET, ENV_MAIL_OPT_ENVID,
-#endif
   ENV_MAIL_OPT_NULL
   };
 typedef struct {
@@ -238,10 +234,8 @@ static env_mail_type_t env_mail_type_list[] = {
 #ifndef DISABLE_PRDR
     { US"PRDR",   ENV_MAIL_OPT_PRDR,   FALSE },
 #endif
-#ifdef EXPERIMENTAL_DSN
     { US"RET",    ENV_MAIL_OPT_RET,    TRUE },
     { US"ENVID",  ENV_MAIL_OPT_ENVID,  TRUE },
-#endif
     { US"NULL",   ENV_MAIL_OPT_NULL,   FALSE }
   };

@@ -1500,11 +1494,9 @@ sender_verified_list = NULL;        /* No senders verified */
 memset(sender_address_cache, 0, sizeof(sender_address_cache));
 memset(sender_domain_cache, 0, sizeof(sender_domain_cache));

-#ifdef EXPERIMENTAL_DSN
/* Reset the DSN flags */
dsn_ret = 0;
dsn_envid = NULL;
-#endif

authenticated_sender = NULL;
#ifdef EXPERIMENTAL_BRIGHTMAIL
@@ -1855,9 +1847,7 @@ tls_in.sni = NULL;
tls_in.ocsp = OCSP_NOT_REQ;
tls_advertised = FALSE;
#endif
-#ifdef EXPERIMENTAL_DSN
dsn_advertised = FALSE;
-#endif

/* Reset ACL connection variables */

@@ -3147,10 +3137,8 @@ while (done <= 0)
int ptr, size, rc;
int c, i;
auth_instance *au;
-#ifdef EXPERIMENTAL_DSN
uschar *orcpt = NULL;
int flags;
-#endif

   switch(smtp_read_command(TRUE))
     {
@@ -3495,9 +3483,7 @@ while (done <= 0)
     #ifdef SUPPORT_TLS
     tls_advertised = FALSE;
     #endif
-    #ifdef EXPERIMENTAL_DSN
     dsn_advertised = FALSE;
-    #endif

     smtp_code = US"250 ";        /* Default response code plus space*/
     if (user_msg == NULL)
@@ -3581,7 +3567,6 @@ while (done <= 0)
         s = string_cat(s, &size, &ptr, US"-8BITMIME\r\n", 11);
         }

-      #ifdef EXPERIMENTAL_DSN
       /* Advertise DSN support if configured to do so. */
       if (verify_check_host(&dsn_advertise_hosts) != FAIL) 
         {
@@ -3589,7 +3574,6 @@ while (done <= 0)
         s = string_cat(s, &size, &ptr, US"-DSN\r\n", 6);
         dsn_advertised = TRUE;
         }
-      #endif

       /* Advertise ETRN if there's an ACL checking whether a host is
       permitted to issue it; a check is made when any host actually tries. */
@@ -3846,8 +3830,6 @@ while (done <= 0)
           arg_error = TRUE;
           break;

-        #ifdef EXPERIMENTAL_DSN
-  
         /* Handle the two DSN options, but only if configured to do so (which
         will have caused "DSN" to be given in the EHLO response). The code itself
         is included only if configured in at build time. */
@@ -3883,7 +3865,6 @@ while (done <= 0)
             DEBUG(D_receive) debug_printf("DSN_ENVID: %s\n", dsn_envid);
           }
           break;
-        #endif

         /* Handle the AUTH extension. If the value given is not "<>" and either
         the ACL says "yes" or there is no ACL but the sending host is
@@ -4161,8 +4142,7 @@ while (done <= 0)
       rcpt_fail_count++;
       break;
       }
-    
-    #ifdef EXPERIMENTAL_DSN
+
     /* Set the DSN flags orcpt and dsn_flags from the session*/
     orcpt = NULL;
     flags = 0;
@@ -4245,7 +4225,6 @@ while (done <= 0)
         break;
         }
       }
-    #endif

     /* Apply SMTP rewriting then extract the working address. Don't allow "<>"
     as a recipient address */
@@ -4360,8 +4339,7 @@ while (done <= 0)
       if (user_msg == NULL) smtp_printf("250 Accepted\r\n");
         else smtp_user_msg(US"250", user_msg);
       receive_add_recipient(recipient, -1);
-      
-      #ifdef EXPERIMENTAL_DSN
+ 
       /* Set the dsn flags in the recipients_list */
       if (orcpt != NULL)
         recipients_list[recipients_count-1].orcpt = orcpt;
@@ -4373,8 +4351,6 @@ while (done <= 0)
       else
         recipients_list[recipients_count-1].dsn_flags = 0;
       DEBUG(D_receive) debug_printf("DSN: orcpt: %s  flags: %d\n", recipients_list[recipients_count-1].orcpt, recipients_list[recipients_count-1].dsn_flags);
-      #endif
-      
       }

     /* The recipient was discarded */
diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index bd8f094..79970cb 100644
--- a/src/src/spool_in.c
+++ b/src/src/spool_in.c
@@ -299,10 +299,8 @@ tls_in.ocsp = OCSP_NOT_REQ;
 spam_score_int = NULL;
 #endif

-#ifdef EXPERIMENTAL_DSN
dsn_ret = 0;
dsn_envid = NULL;
-#endif

 /* Generate the full name and open the file. If message_subdir is already
 set, just look in the given directory. Otherwise, look in both the split
@@ -493,13 +491,11 @@ for (;;)
     case 'd':
     if (Ustrcmp(p, "eliver_firsttime") == 0)
       deliver_firsttime = TRUE;
-#ifdef EXPERIMENTAL_DSN
     /* Check if the dsn flags have been set in the header file */
     else if (Ustrncmp(p, "sn_ret", 6) == 0)
       dsn_ret= atoi(CS big_buffer + 8);
     else if (Ustrncmp(p, "sn_envid", 8) == 0)
       dsn_envid = string_copy(big_buffer + 11);
-#endif
     break;

     case 'f':
@@ -645,10 +641,8 @@ for (recipients_count = 0; recipients_count < rcount; recipients_count++)
   {
   int nn;
   int pno = -1;
-#ifdef EXPERIMENTAL_DSN
   int dsn_flags = 0;
   uschar *orcpt = NULL;
-#endif
   uschar *errors_to = NULL;
   uschar *p;

@@ -725,7 +719,7 @@ for (recipients_count = 0; recipients_count < rcount; recipients_count++)
     {
     int flags;

-#if defined(EXPERIMENTAL_DSN) && !defined (COMPILE_UTILITY)
+#if !defined (COMPILE_UTILITY)
     DEBUG(D_deliver) debug_printf("**** SPOOL_IN - Exim 4 standard format spoolfile\n");
 #endif

@@ -745,7 +739,6 @@ for (recipients_count = 0; recipients_count < rcount; recipients_count++)
       }

     *(--p) = 0;   /* Terminate address */
-#ifdef EXPERIMENTAL_DSN
     if ((flags & 0x02) != 0)      /* one_time data exists */
       {
       int len;
@@ -760,9 +753,8 @@ for (recipients_count = 0; recipients_count < rcount; recipients_count++)
       }

     *(--p) = 0;   /* Terminate address */
-#endif  /* EXPERIMENTAL_DSN */
     }
-#if defined(EXPERIMENTAL_DSN) && !defined(COMPILE_UTILITY)
+#if !defined(COMPILE_UTILITY)
   else
     { DEBUG(D_deliver) debug_printf("**** SPOOL_IN - No additional fields\n"); }

@@ -776,15 +768,13 @@ for (recipients_count = 0; recipients_count < rcount; recipients_count++)
     DEBUG(D_deliver) debug_printf("**** SPOOL_IN - address: |%s| errorsto: |%s|\n",
       big_buffer, errors_to);
     }
-#endif  /* EXPERIMENTAL_DSN */
+#endif

recipients_list[recipients_count].address = string_copy(big_buffer);
recipients_list[recipients_count].pno = pno;
recipients_list[recipients_count].errors_to = errors_to;
-#ifdef EXPERIMENTAL_DSN
recipients_list[recipients_count].orcpt = orcpt;
recipients_list[recipients_count].dsn_flags = dsn_flags;
-#endif
}

 /* The remainder of the spool header file contains the headers for the message,
diff --git a/src/src/spool_out.c b/src/src/spool_out.c
index 67ac8bc..fc56057 100644
--- a/src/src/spool_out.c
+++ b/src/src/spool_out.c
@@ -245,13 +245,11 @@ if (tls_in.ourcert)
 if (tls_in.ocsp)     fprintf(f, "-tls_ocsp %d\n",   tls_in.ocsp);
 #endif

-#ifdef EXPERIMENTAL_DSN
/* Write the dsn flags to the spool header file */
DEBUG(D_deliver) debug_printf("DSN: Write SPOOL :-dsn_envid %s\n", dsn_envid);
if (dsn_envid != NULL) fprintf(f, "-dsn_envid %s\n", dsn_envid);
DEBUG(D_deliver) debug_printf("DSN: Write SPOOL :-dsn_ret %d\n", dsn_ret);
if (dsn_ret != 0) fprintf(f, "-dsn_ret %d\n", dsn_ret);
-#endif

 /* To complete the envelope, write out the tree of non-recipients, followed by
 the list of recipients. These won't be disjoint the first time, when no
@@ -263,34 +261,21 @@ fprintf(f, "%d\n", recipients_count);
 for (i = 0; i < recipients_count; i++)
   {
   recipient_item *r = recipients_list + i;
-#ifdef EXPERIMENTAL_DSN
 DEBUG(D_deliver) debug_printf("DSN: Flags :%d\n", r->dsn_flags);
-#endif
-  if (r->pno < 0 && r->errors_to == NULL
-    #ifdef EXPERIMENTAL_DSN
-     && r->dsn_flags == 0
-    #endif
-    )
+  if (r->pno < 0 && r->errors_to == NULL && r->dsn_flags == 0)
     fprintf(f, "%s\n", r->address);
   else
     {
     uschar *errors_to = (r->errors_to == NULL)? US"" : r->errors_to;
-    #ifdef EXPERIMENTAL_DSN
     /* for DSN SUPPORT extend exim 4 spool in a compatible way by
        adding new values upfront and add flag 0x02 */
     uschar *orcpt = (r->orcpt == NULL)? US"" : r->orcpt;
     fprintf(f, "%s %s %d,%d %s %d,%d#3\n", r->address, orcpt, Ustrlen(orcpt), r->dsn_flags,
       errors_to, Ustrlen(errors_to), r->pno);
-    #else
-    fprintf(f, "%s %s %d,%d#1\n", r->address, errors_to,
-      Ustrlen(errors_to), r->pno);
-    #endif
     }

-    #ifdef EXPERIMENTAL_DSN
       DEBUG(D_deliver) debug_printf("DSN: **** SPOOL_OUT - address: |%s| errorsto: |%s| orcpt: |%s| dsn_flags: %d\n",
          r->address, r->errors_to, r->orcpt, r->dsn_flags);
-    #endif
   }

 /* Put a blank line before the headers */
diff --git a/src/src/structs.h b/src/src/structs.h
index 2250bbb..3cdf12a 100644
--- a/src/src/structs.h
+++ b/src/src/structs.h
@@ -286,9 +286,7 @@ typedef struct router_instance {
   BOOL    verify_sender;          /* Use this router when verifying a sender */
   BOOL    uid_set;                /* Flag to indicate uid is set */
   BOOL    unseen;                 /* If TRUE carry on, even after success */
-#ifdef EXPERIMENTAL_DSN
   BOOL    dsn_lasthop;            /* If TRUE, this router is a DSN endpoint */
-#endif

   int     self_code;              /* Encoded version of "self" */
   uid_t   uid;                    /* Fixed uid value */
@@ -560,11 +558,9 @@ typedef struct address_item {
   uschar *auth_id;          /* auth "login" name used by transport */
   uschar *auth_sndr;          /* AUTH arg to SMTP MAIL, used by transport */

-  #ifdef EXPERIMENTAL_DSN
   uschar *dsn_orcpt;              /* DSN orcpt value */
   int     dsn_flags;              /* DSN flags */
   int     dsn_aware;              /* DSN aware flag */
-  #endif

   uid_t   uid;                    /* uid for transporting */
   gid_t   gid;                    /* gid for transporting */
diff --git a/src/src/transport.c b/src/src/transport.c
index 30e4268..58fc4ec 100644
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -1842,10 +1842,8 @@ if ((pid = fork()) == 0)

argv = child_exec_exim(CEE_RETURN_ARGV, TRUE, &i, FALSE, 0);

- #ifdef EXPERIMENTAL_DSN
/* Call with the dsn flag */
if (smtp_use_dsn) argv[i++] = US"-MCD";
- #endif

if (smtp_authenticated) argv[i++] = US"-MCA";

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 181081b..017cc5a 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -273,14 +273,12 @@ smtp_transport_options_block smtp_transport_option_defaults = {
#endif
};

-#ifdef EXPERIMENTAL_DSN
/* some DSN flags for use later */

 static int     rf_list[] = {rf_notify_never, rf_notify_success,
                             rf_notify_failure, rf_notify_delay };

static uschar *rf_names[] = { US"NEVER", US"SUCCESS", US"FAILURE", US"DELAY" };
-#endif

@@ -1278,9 +1276,7 @@ BOOL pass_message = FALSE;
 BOOL prdr_offered = FALSE;
 BOOL prdr_active;
 #endif
-#ifdef EXPERIMENTAL_DSN
 BOOL dsn_all_lasthop = TRUE;
-#endif
 #if defined(SUPPORT_TLS) && defined(EXPERIMENTAL_DANE)
 BOOL dane = FALSE;
 dns_answer tlsa_dnsa;
@@ -1743,12 +1739,10 @@ if (continue_hostname == NULL
     {DEBUG(D_transport) debug_printf("PRDR usable\n");}
 #endif

-#ifdef EXPERIMENTAL_DSN
   /* Note if the server supports DSN */
   smtp_use_dsn = esmtp && pcre_exec(regex_DSN, NULL, CS buffer, (int)Ustrlen(CS buffer), 0,
        PCRE_EOPT, NULL, 0) >= 0;
   DEBUG(D_transport) debug_printf("use_dsn=%d\n", smtp_use_dsn);
-#endif

/* Note if the response to EHLO specifies support for the AUTH extension.
If it has, check that this host is one we want to authenticate to, and do
@@ -1846,7 +1840,6 @@ if (prdr_offered)
}
#endif

-#ifdef EXPERIMENTAL_DSN
 /* check if all addresses have lasthop flag */
 /* do not send RET and ENVID if true */
 dsn_all_lasthop = TRUE;
@@ -1876,7 +1869,6 @@ if ((smtp_use_dsn) && (dsn_all_lasthop == FALSE))
     while (*p) p++;
     }
   }
-#endif

/* If an authenticated_sender override has been specified for this transport
instance, expand it. If the expansion is forced to fail, and there was already
@@ -1943,16 +1935,13 @@ for (addr = first_addr;
int count;
BOOL no_flush;

-#ifdef EXPERIMENTAL_DSN
addr->dsn_aware = smtp_use_dsn ? dsn_support_yes : dsn_support_no;
-#endif

if (addr->transport_return != PENDING_DEFER) continue;

address_count++;
no_flush = smtp_use_pipelining && (!mua_wrapper || addr->next != NULL);

-#ifdef EXPERIMENTAL_DSN
/* Add any DSN flags to the rcpt command and add to the sent string */

   p = buffer;
@@ -1983,21 +1972,14 @@ for (addr = first_addr;
       while (*p) p++;
       }
     }
-#endif
-

/* Now send the RCPT command, and process outstanding responses when
necessary. After a timeout on RCPT, we just end the function, leaving the
yield as OK, because this error can often mean that there is a problem with
just one address, so we don't want to delay the host. */

-#ifdef EXPERIMENTAL_DSN
   count = smtp_write_command(&outblock, no_flush, "RCPT TO:<%s>%s%s\r\n",
     transport_rcpt_address(addr, tblock->rcpt_include_affixes), igquotstr, buffer);
-#else
-  count = smtp_write_command(&outblock, no_flush, "RCPT TO:<%s>%s\r\n",
-    transport_rcpt_address(addr, tblock->rcpt_include_affixes), igquotstr);
-#endif

if (count < 0) goto SEND_FAILED;
if (count > 0)
diff --git a/test/mail/0015.CALLER b/test/mail/0015.CALLER
index 2f531e6..01ec977 100644
--- a/test/mail/0015.CALLER
+++ b/test/mail/0015.CALLER
@@ -9,12 +9,17 @@ X-Failed-Recipients: page+userx@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmaZ-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
X-local_part: CALLER
X-local_part_prefix:

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -23,7 +28,17 @@ recipients. This is a permanent error. The following address(es) failed:
   pipe to |callpager
     generated by page+userx@???

 A message that you sent could not be delivered to one or more of its
@@ -62,7 +84,17 @@ recipients. This is a permanent error. The following address(es) failed:
     generated by page+userx@???
     (ultimately generated from page+ux@???)

 A message that you sent could not be delivered to one or more of its
@@ -21,7 +26,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     lowest numbered MX record points to local host

 A message that you sent could not be delivered to one or more of its
@@ -27,7 +32,23 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     subject was    "should fail this" (filter fail)

 A message that you sent could not be delivered to one or more of its
@@ -82,7 +110,17 @@ recipients. This is a permanent error. The following address(es) failed:
   pipe to |cat
     generated by filter-pipe@???

 A message that you sent could not be delivered to one or more of its
@@ -119,7 +164,17 @@ recipients. This is a permanent error. The following address(es) failed:
   save to /tmp/junk
     generated by filter-file@???

 A message that you sent could not be delivered to one or more of its
@@ -156,7 +218,17 @@ recipients. This is a permanent error. The following address(es) failed:
   filter-lookup@???
     retry timeout exceeded

 A message that you sent could not be delivered to one or more of its
@@ -193,7 +272,17 @@ recipients. This is a permanent error. The following address(es) failed:
   filter-exists@???
     retry timeout exceeded

 A message that you sent could not be delivered to one or more of its
@@ -230,7 +326,17 @@ recipients. This is a permanent error. The following address(es) failed:
   filter-readfile@???
     retry timeout exceeded

 A message that you sent could not be delivered to one or more of its
@@ -267,7 +380,17 @@ recipients. This is a permanent error. The following address(es) failed:
   filter-run@???
     retry timeout exceeded

 A message that you sent could not be delivered to one or more of its
@@ -322,7 +452,17 @@ recipients. This is a permanent error. The following address(es) failed:
   readfile@???
     retry timeout exceeded

 A message that you sent could not be delivered to one or more of its
@@ -359,7 +506,17 @@ recipients. This is a permanent error. The following address(es) failed:
   filter-stat@???
     retry timeout exceeded

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;filter-stat@???
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -373,6 +530,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
X-added: qualify_domain is test.ex

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Envelope-to: CALLER@???
diff --git a/test/mail/0048.CALLER b/test/mail/0048.CALLER
index 11101b6..5df1365 100644
--- a/test/mail/0048.CALLER
+++ b/test/mail/0048.CALLER
@@ -9,10 +9,15 @@ X-Failed-Recipients: pipe@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmaY-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
@@ -65,7 +70,17 @@ Some message text.

------------------

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -78,6 +93,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

Some message text.

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Envelope-to: CALLER@???
@@ -89,10 +106,15 @@ X-Failed-Recipients: prefixed+pipe@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmbA-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
@@ -145,7 +167,17 @@ Text

------------------

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -158,6 +190,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

Text

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Envelope-to: CALLER@???
@@ -169,10 +203,15 @@ X-Failed-Recipients: pipe-suffixed@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmbC-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
@@ -225,7 +264,17 @@ Text

------------------

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -238,6 +287,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

Text

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Envelope-to: CALLER@???
@@ -249,10 +300,15 @@ X-Failed-Recipients: prefixed+pipe-suffixed@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmbE-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
@@ -305,7 +361,17 @@ Text

------------------

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -318,6 +384,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

Text

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Envelope-to: CALLER@???
@@ -329,10 +397,15 @@ X-Failed-Recipients: pipe@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmbG-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
@@ -385,7 +458,17 @@ Some message text.

------------------

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -398,3 +481,5 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

Some message text.

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/mail/0051.CALLER b/test/mail/0051.CALLER
index 322a48d..c3f9035 100644
--- a/test/mail/0051.CALLER
+++ b/test/mail/0051.CALLER
@@ -9,10 +9,15 @@ X-Failed-Recipients: userx@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmaZ-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -21,7 +26,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     Unrouteable address

 A message that you sent could not be delivered to one or more of its
@@ -57,7 +79,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     unrouteable mail domain "badbad.ex" (:fail:)

 A message that you sent could not be delivered to one or more of its
@@ -93,7 +132,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     Unrouteable address

 A message that you sent could not be delivered to one or more of its
@@ -129,7 +185,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     unrouteable mail domain "domain2.ex" (:fail:)

 A message that you sent could not be delivered to one or more of its
@@ -21,7 +26,17 @@ recipients. This is a permanent error. The following address(es) failed:
   xx99@???
     Unrouteable address

 A message that you sent could not be delivered to one or more of its
@@ -57,7 +79,17 @@ recipients. This is a permanent error. The following address(es) failed:
   !two@???
     Unrouteable address

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: delayed
+Final-Recipient: rfc822;|/non/existing/file
+Status: 4.0.0
+Action: delayed
+Final-Recipient: rfc822;defer@???
+Status: 4.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/rfc822-headers
+
+Return-path: <CALLER@???>
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+    (envelope-from <CALLER@???>)
+    id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Envelope-to: CALLER@???
@@ -41,10 +72,15 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Warning: message 10HmaZ-0005vi-00 delayed 0 minutes
 Message-Id: <E10HmbA-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.
A message that you sent has not yet been delivered to one or more of its
recipients after more than 0 minutes on the queue on the.local.host.name.
@@ -64,6 +100,32 @@ some time, and this warning may be repeated at intervals if the message
remains undelivered. Eventually the mail delivery software will give up,
and when that happens, the message will be returned to you.

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: delayed
+Final-Recipient: rfc822;defer@???
+Status: 4.0.0
+Action: delayed
+Final-Recipient: rfc822;defer@???
+Status: 4.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/rfc822-headers
+
+Return-path: <CALLER@???>
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+    (envelope-from <CALLER@???>)
+    id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Envelope-to: CALLER@???
@@ -74,10 +136,15 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Warning: message 10HmaX-0005vi-00 delayed 0 minutes
 Message-Id: <E10HmbC-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.
A message that you sent has not yet been delivered to one or more of its
recipients after more than 0 minutes on the queue on the.local.host.name.
@@ -97,6 +164,32 @@ some time, and this warning may be repeated at intervals if the message
remains undelivered. Eventually the mail delivery software will give up,
and when that happens, the message will be returned to you.

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: delayed
+Final-Recipient: rfc822;|/non/existing/file
+Status: 4.0.0
+Action: delayed
+Final-Recipient: rfc822;defer@???
+Status: 4.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/rfc822-headers
+
+Return-path: <CALLER@???>
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+    (envelope-from <CALLER@???>)
+    id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Envelope-to: CALLER@???
@@ -107,10 +200,15 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Warning: message 10HmaX-0005vi-00 delayed by 10 minutes
 Message-Id: <E10HmbE-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
 warn_message_delay      = 10 minutes
 warn_message_recipients = CALLER@???
 warn_message_recipients = CALLER@???
@@ -125,6 +223,32 @@ warnmsg_recipients      = CALLER@???

Final stuff.

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: delayed
+Final-Recipient: rfc822;|/non/existing/file
+Status: 4.0.0
+Action: delayed
+Final-Recipient: rfc822;defer@???
+Status: 4.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/rfc822-headers
+
+Return-path: <CALLER@???>
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+    (envelope-from <CALLER@???>)
+    id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Envelope-to: CALLER@???
@@ -135,10 +259,15 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Warning: message 10HmaZ-0005vi-00 delayed by 0 minutes
 Message-Id: <E10HmbF-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
 warn_message_delay      = 0 minutes
 warn_message_recipients = CALLER@???
 warn_message_recipients = CALLER@???
@@ -153,6 +282,32 @@ warnmsg_recipients      = CALLER@???

Final stuff.

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: delayed
+Final-Recipient: rfc822;defer@???
+Status: 4.0.0
+Action: delayed
+Final-Recipient: rfc822;defer@???
+Status: 4.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/rfc822-headers
+
+Return-path: <CALLER@???>
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+    (envelope-from <CALLER@???>)
+    id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Envelope-to: CALLER@???
@@ -163,10 +318,15 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Warning: message 10HmbB-0005vi-00 delayed by 0 minutes
 Message-Id: <E10HmbG-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
 warn_message_delay      = 0 minutes
 warn_message_recipients = CALLER@???
 warn_message_recipients = CALLER@???
@@ -178,6 +338,30 @@ warnmsg_recipients      = CALLER@???

Final stuff.

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: delayed
+Final-Recipient: rfc822;xxxx@???
+Status: 4.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/rfc822-headers
+
+Return-path: <CALLER@???>
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+    (envelope-from <CALLER@???>)
+    id 10HmbB-0005vi-00
+    for xxxx@???; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbB-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Envelope-to: CALLER@???
@@ -188,10 +372,15 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Warning: message 10HmbD-0005vi-00 delayed by 0 minutes
 Message-Id: <E10HmbH-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
 warn_message_delay      = 0 minutes
 warn_message_recipients = CALLER@???
 warn_message_recipients = CALLER@???
@@ -203,3 +392,27 @@ warnmsg_recipients      = CALLER@???

Final stuff.

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: delayed
+Final-Recipient: rfc822;yyyy@???
+Status: 4.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/rfc822-headers
+
+Return-path: <CALLER@???>
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+    (envelope-from <CALLER@???>)
+    id 10HmbD-0005vi-00
+    for yyyy@???; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbD-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/mail/0103.CALLER b/test/mail/0103.CALLER
index f8ac3c4..64ca04d 100644
--- a/test/mail/0103.CALLER
+++ b/test/mail/0103.CALLER
@@ -6,10 +6,15 @@ X-Failed-Recipients: WASabc@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmaZ-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -19,7 +24,17 @@ recipients. This is a permanent error. The following address(es) failed:
     (generated from "abc@???)
     Unrouteable address

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbD-0005vi-00
@@ -40,10 +57,15 @@ X-Failed-Recipients: ":fail: fail message"@special
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbD-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -52,7 +74,17 @@ recipients. This is a permanent error. The following address(es) failed:
   ":fail: fail message"@special
     fail message

 A message sent by
@@ -23,7 +28,17 @@ address(es) failed:
     (generated from forwarder@???)
     Address unknown (:fail:)

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbC-0005vi-00
@@ -43,10 +60,15 @@ X-Failed-Recipients: unknown@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: forwarder@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed
 Message-Id: <E10HmbC-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message sent by
@@ -60,7 +82,17 @@ address(es) failed:
     (generated from forwarder@???)
     Address unknown (:fail:)

------- This is a copy of the message's headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;unknown@???
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/rfc822-headers

Return-path: <abcd@???>
Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
@@ -71,3 +103,5 @@ From: abcd@???
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/mail/0140.CALLER b/test/mail/0140.CALLER
index e7882aa..495410d 100644
--- a/test/mail/0140.CALLER
+++ b/test/mail/0140.CALLER
@@ -27,10 +27,15 @@ X-Failed-Recipients: reply2@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmbA-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
@@ -38,7 +43,17 @@ recipients. This is a permanent error. The following address(es) failed:

reply2@???

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;reply2@???
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -51,3 +66,5 @@ From: CALLER_NAME <CALLER@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/mail/0142.CALLER b/test/mail/0142.CALLER
index a7d97c7..73c8236 100644
--- a/test/mail/0142.CALLER
+++ b/test/mail/0142.CALLER
@@ -6,10 +6,15 @@ X-Failed-Recipients: pipe@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmaY-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
@@ -26,7 +31,17 @@ max fd = dddd
1 opt=0 STATUS
2 opt=0 STATUS

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;pipe@???
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -38,3 +53,5 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

Test message

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/mail/0164.CALLER b/test/mail/0164.CALLER
index 208c762..3a1b3d1 100644
--- a/test/mail/0164.CALLER
+++ b/test/mail/0164.CALLER
@@ -6,10 +6,15 @@ X-Failed-Recipients: system-filter
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmaY-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
@@ -62,7 +67,17 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

------------------

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv $recipients
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -74,6 +89,8 @@ From: CALLER_NAME <CALLER@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
@@ -82,10 +99,15 @@ X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbA-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
@@ -137,7 +159,17 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

------------------

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv $recipients
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -148,3 +180,5 @@ From: CALLER_NAME <CALLER@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/mail/0165.CALLER b/test/mail/0165.CALLER
index 4ede20d..0c1cd68 100644
--- a/test/mail/0165.CALLER
+++ b/test/mail/0165.CALLER
@@ -6,10 +6,15 @@ X-Failed-Recipients: system-filter
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmaY-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
@@ -62,7 +67,17 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

------------------

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv $recipients
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -74,6 +89,8 @@ From: CALLER_NAME <CALLER@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
@@ -82,10 +99,15 @@ X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbA-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

 A message that you sent could not be delivered to one or more of its
@@ -18,7 +23,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     unrouteable mail domain "non-local.example" (:fail:)

 A message that you sent could not be delivered to one or more of its
@@ -18,7 +23,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     subject was "fail this" (filter fail)

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
@@ -55,10 +78,15 @@ X-Failed-Recipients: seven@???,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbA-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbD-0005vi-00
@@ -112,10 +170,15 @@ X-Failed-Recipients: userz@???,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbD-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
@@ -136,7 +199,23 @@ The following text was generated during the delivery attempts:

This script generates this message and returns the value of its argument.

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;userz@???
+Status: 5.0.0
+Action: failed
+Final-Recipient: rfc822;usery@???
+Status: 5.0.0
+Action: failed
+Final-Recipient: rfc822;userx@???
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@ -149,3 +228,5 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

More message 99

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index 4a9257c..ab46094 100644
--- a/test/mail/0211.CALLER
+++ b/test/mail/0211.CALLER
@@ -7,10 +7,15 @@ X-Failed-Recipients: userx@domain1
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmaY-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -21,7 +26,19 @@ recipients. This is a permanent error. The following address(es) failed:
     SMTP error from remote mail server after initial connection:
     550 Go away

 A message that you sent could not be delivered to one or more of its
@@ -62,7 +86,24 @@ recipients. This is a permanent error. The following address(es) failed:
     SMTP error from remote mail server after HELO the.local.host.name:
     550 Go away

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;userx@domain1
+Status: 5.0.0
+Remote-MTA: dns; 127.0.0.1
+Diagnostic-Code: smtp; 0
+Action: failed
+Final-Recipient: rfc822;usery@domain2
+Status: 5.0.0
+Remote-MTA: dns; 127.0.0.1
+Diagnostic-Code: smtp; 0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -74,3 +115,5 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

Test message 2

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/mail/0224.CALLER b/test/mail/0224.CALLER
index a2dea13..0564925 100644
--- a/test/mail/0224.CALLER
+++ b/test/mail/0224.CALLER
@@ -9,10 +9,15 @@ X-Failed-Recipients: bounce@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmaY-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -24,7 +29,20 @@ recipients. This is a permanent error. The following address(es) failed:
   an undisclosed address
     (generated from useryx@???)

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: delayed
+Final-Recipient: rfc822;/no/such/file
+Status: 4.0.0
+Action: delayed
+Final-Recipient: rfc822;defer@???
+Status: 4.0.0
+Action: delayed
+Final-Recipient: rfc822;hdefer@???
+Status: 4.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/rfc822-headers
+
+Return-path: <CALLER@???>
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+    (envelope-from <CALLER@???>)
+    id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Subject: second message
+Message-Id: <E10HmaZ-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/mail/0226.CALLER b/test/mail/0226.CALLER
index b2c29d1..8d5a694 100644
--- a/test/mail/0226.CALLER
+++ b/test/mail/0226.CALLER
@@ -7,10 +7,15 @@ X-Failed-Recipients: |/p/q/r@???,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmaY-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -21,7 +26,20 @@ recipients. This is a permanent error. The following address(es) failed:
   save to /a/b/c
     generated by /a/b/c@???

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;/a/b/c
+Status: 5.0.0
+Action: failed
+Final-Recipient: rfc822;|/p/q/r
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -33,6 +51,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

Message 1

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
@@ -41,10 +61,15 @@ X-Failed-Recipients: |TESTSUITE/aux-fixed/showenv@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbA-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

 A message that you sent could not be delivered to one or more of its
@@ -19,7 +24,20 @@ recipients. This is a permanent error. The following address(es) failed:
   an undisclosed address
     (generated from /a/b/c@???)

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;/a/b/c
+Status: 5.0.0
+Action: failed
+Final-Recipient: rfc822;|/p/q/r
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -31,6 +49,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

Message 1

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
@@ -38,10 +58,15 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbA-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

 A message sent by
@@ -24,7 +29,19 @@ address(es) failed:
     SMTP error from remote mail server after RCPT TO:<fail@???>:
     550 Recipient not OK

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;fail@???
+Status: 5.0.0
+Remote-MTA: dns; 127.0.0.1
+Diagnostic-Code: smtp; 0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <pqr@???>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@ -36,3 +53,5 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

Test message 3

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/mail/0256.CALLER b/test/mail/0256.CALLER
index 87ed8a0..7292e9c 100644
--- a/test/mail/0256.CALLER
+++ b/test/mail/0256.CALLER
@@ -5,10 +5,15 @@ X-Failed-Recipients: unknown@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmaY-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -17,7 +22,17 @@ recipients. This is a permanent error. The following address(es) failed:
   unknown@???
     Unrouteable address

 A message that you sent could not be delivered to one or more of its
@@ -17,7 +22,17 @@ recipients. This is a permanent error. The following address(es) failed:
   unknown@???
     Unrouteable address

 A message that you sent could not be delivered to one or more of its
@@ -17,7 +22,17 @@ recipients. This is a permanent error. The following address(es) failed:
   unknown@???
     Unrouteable address

 A message that you sent could not be delivered to one or more of its
@@ -17,7 +22,17 @@ recipients. This is a permanent error. The following address(es) failed:
   unknown@???
     Unrouteable address

 A message that you sent could not be delivered to one or more of its
@@ -17,7 +22,17 @@ recipients. This is a permanent error. The following address(es) failed:
   spqr@???
     Unrouteable address

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
@@ -36,10 +53,15 @@ X-Failed-Recipients: abcd@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: abcd@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbA-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -48,7 +70,17 @@ recipients. This is a permanent error. The following address(es) failed:
   abcd@???
     Unrouteable address

 A message that you sent could not be delivered to one or more of its
@@ -18,7 +23,17 @@ recipients. This is a permanent error. The following address(es) failed:
   failure@???
     this message is a failure (filter fail)

 A message that you sent could not be delivered to one or more of its
@@ -19,7 +24,17 @@ recipients. This is a permanent error. The following address(es) failed:
     This message is being failed and there's a long and tortuous
     explanation about is that is being sent back to the user.

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
@@ -39,10 +56,15 @@ X-Failed-Recipients: failure2@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbA-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -51,7 +73,17 @@ recipients. This is a permanent error. The following address(es) failed:
   failure2@???
     delivery cancelled

 A message that you sent could not be delivered to one or more of its
@@ -18,7 +23,17 @@ recipients. This is a permanent error. The following address(es) failed:
   list1@???
     list1@??? is a closed mailing list

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
@@ -38,10 +55,15 @@ X-Failed-Recipients: nonlist@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: anyone@anywhere
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbC-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -50,7 +72,17 @@ recipients. This is a permanent error. The following address(es) failed:
   nonlist@???
     nonlist@??? is a closed mailing list

 A message that you sent could not be delivered to one or more of its
@@ -18,7 +23,17 @@ recipients. This is a permanent error. The following address(es) failed:
   list1@???
     list1@??? is a closed mailing list

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
@@ -38,10 +55,15 @@ X-Failed-Recipients: nonlist@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: anyone@anywhere
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbC-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -50,7 +72,17 @@ recipients. This is a permanent error. The following address(es) failed:
   nonlist@???
     nonlist@??? is a closed mailing list

 A message that you sent could not be delivered to one or more of its
@@ -18,4 +23,28 @@ recipients. This is a permanent error. The following address(es) failed:
   abcd@???
     mailbox is full: retry timeout exceeded

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;abcd@???
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
+
+Return-path: <CALLER@???>
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+    (envelope-from <CALLER@???>)
+    id 10HmaX-0005vi-00
+    for abcd@???; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is a test message. This is a test message.
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--

diff --git a/test/mail/0321.CALLER b/test/mail/0321.CALLER
index 5d836a5..1715e61 100644
--- a/test/mail/0321.CALLER
+++ b/test/mail/0321.CALLER
@@ -6,10 +6,15 @@ X-Failed-Recipients: |/bin/cat\ /etc/aliases\ @test.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmaY-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -18,7 +23,17 @@ recipients. This is a permanent error. The following address(es) failed:
   |/bin/cat\ /etc/aliases\ @test.ex
     local delivery failed

 A message that you sent could not be delivered to one or more of its
@@ -25,7 +30,22 @@ recipients. This is a permanent error. The following address(es) failed:
   b1@???
     local delivery failed

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;b1@???
+Status: 5.0.0
+Action: failed
+Final-Recipient: rfc822;d3@???
+Status: 5.0.0
+Remote-MTA: dns; 127.0.0.1
+Diagnostic-Code: smtp; 0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@ -36,3 +56,5 @@ From: CALLER_NAME <CALLER@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/mail/0375.CALLER b/test/mail/0375.CALLER
index 72ecd22..a2929c3 100644
--- a/test/mail/0375.CALLER
+++ b/test/mail/0375.CALLER
@@ -8,10 +8,15 @@ X-Failed-Recipients: e1@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmaY-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -22,7 +27,19 @@ recipients. This is a permanent error. The following address(es) failed:
     SMTP error from remote mail server after RCPT TO:<e1@???>:
     550 hard error

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;e1@???
+Status: 5.0.0
+Remote-MTA: dns; 127.0.0.1
+Diagnostic-Code: smtp; 0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@ -33,3 +50,5 @@ From: CALLER_NAME <CALLER@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/mail/0383.CALLER b/test/mail/0383.CALLER
index e54e474..d2e55b6 100644
--- a/test/mail/0383.CALLER
+++ b/test/mail/0383.CALLER
@@ -6,10 +6,15 @@ X-Failed-Recipients: system-filter
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmaY-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
@@ -64,7 +69,17 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

------------------

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv $thisaddress $1
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@ -77,6 +92,8 @@ From: CALLER_NAME <CALLER@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
@@ -85,10 +102,15 @@ X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbA-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
@@ -163,10 +197,15 @@ X-Failed-Recipients: redking@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbC-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

 A message that you sent could not be delivered to one or more of its
@@ -18,7 +23,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     forced failure

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
@@ -40,10 +57,15 @@ X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbA-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -52,7 +74,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     forced failure

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
@@ -77,10 +111,15 @@ X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbC-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -89,7 +128,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     forced failure

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbE-0005vi-00
@@ -142,10 +193,15 @@ X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbE-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -154,9 +210,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     forced failure

------- This is a copy of the message, including all the headers. ------
------- The body of the message is 10019 characters long; only the first
------- 8192 or so are included here.
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;userx@???
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/rfc822-headers

Return-path: <CALLER@???>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@ -166,169 +230,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmbD-0005vi-00@???>
From: CALLER_NAME <CALLER@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
+X-Exim-DSN-Information: Due to administrative limits only headers are returned
+

-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--

diff --git a/test/mail/0428.CALLER b/test/mail/0428.CALLER
index 2cea2cb..ff0af0d 100644
--- a/test/mail/0428.CALLER
+++ b/test/mail/0428.CALLER
@@ -9,10 +9,15 @@ X-Failed-Recipients: restrict-userx@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmbC-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -21,7 +26,17 @@ recipients. This is a permanent error. The following address(es) failed:
   save to userx-extra
     generated by restrict-userx@???

 A message that you sent could not be delivered to one or more of its
@@ -58,7 +80,17 @@ recipients. This is a permanent error. The following address(es) failed:
   save to inbox
     generated by restrict-userx@???

 A message that you sent could not be delivered to one or more of its
@@ -37,7 +42,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     retry timeout exceeded

 A message that you sent could not be delivered to one or more of its
@@ -18,7 +23,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     retry time not reached for any host after a long failure period

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbD-0005vi-00
@@ -39,10 +56,15 @@ X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbD-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -51,7 +73,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     retry timeout exceeded

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbF-0005vi-00
@@ -72,10 +106,15 @@ X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbF-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -84,7 +123,17 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@???
     retry time not reached for any host after a long failure period

 A message that you sent could not be delivered to one or more of its
@@ -18,7 +23,17 @@ recipients. This is a permanent error. The following address(es) failed:
   nofilter@???
     local delivery failed

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
@@ -38,10 +55,15 @@ X-Failed-Recipients: filter@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbA-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -50,7 +72,17 @@ recipients. This is a permanent error. The following address(es) failed:
   filter@???
     local delivery failed

 A message that you sent could not be delivered to one or more of its
@@ -19,7 +24,19 @@ recipients. This is a permanent error. The following address(es) failed:
   host 127.0.0.1 [127.0.0.1]
     LMTP error after DATA: 450 TEMPERROR: retry timeout exceeded

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;userx@???
+Status: 5.0.0
+Remote-MTA: dns; 127.0.0.1
+Diagnostic-Code: smtp; 0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@ -31,6 +48,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

This is a test message.

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
@@ -39,10 +58,15 @@ X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbA-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -52,7 +76,19 @@ recipients. This is a permanent error. The following address(es) failed:
   host 127.0.0.1 [127.0.0.1]
     LMTP error after DATA: 450 TEMPERROR: retry timeout exceeded

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;userx@???
+Status: 5.0.0
+Remote-MTA: dns; 127.0.0.1
+Diagnostic-Code: smtp; 0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@ -65,6 +101,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

This is a test message.

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
@@ -73,10 +111,15 @@ X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbC-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -87,7 +130,19 @@ recipients. This is a permanent error. The following address(es) failed:
     SMTP error from remote mail server after RCPT TO:<userx@???>:
     450 TEMPERROR: retry timeout exceeded

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;userx@???
+Status: 5.0.0
+Remote-MTA: dns; 127.0.0.1
+Diagnostic-Code: smtp; -44
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@ -100,3 +155,5 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

This is a test message.

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/mail/0536.oksender b/test/mail/0536.oksender
index 9a3e0ea..9c4b472 100644
--- a/test/mail/0536.oksender
+++ b/test/mail/0536.oksender
@@ -6,10 +6,15 @@ X-Failed-Recipients: user22@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: oksender@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmbC-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -18,7 +23,17 @@ recipients. This is a permanent error. The following address(es) failed:
   user22@???
     590 5.4.3 Main and extended code

 A message that you sent could not be delivered to one or more of its
@@ -36,7 +41,17 @@ recipients. This is a permanent error. The following address(es) failed:
   jack@???
     LMTP error after end of data: 550 Number 2 fails

 A message that you sent could not be delivered to one or more of its
@@ -72,7 +94,17 @@ recipients. This is a permanent error. The following address(es) failed:
   jack@???
     LMTP error after end of data: 550 Number 2 fails

 A message that you sent could not be delivered to one or more of its
@@ -18,7 +23,17 @@ recipients. This is a permanent error. The following address(es) failed:
   "FAIL cannot route this one (FAIL)"@???
     cannot route this one (FAIL)

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;"FAIL cannot route this one (FAIL)"@???
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

Return-path: <CALLER@???>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@ -31,3 +46,5 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000

Test message

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/runtest b/test/runtest
index 3ca9a67..49964af 100755
--- a/test/runtest
+++ b/test/runtest
@@ -809,7 +809,7 @@ RESET_AFTER_EXTRA_LINE_READ:

# ==========================================================
# MIME boundaries in RFC3461 DSN messages
- s/\d{8,10}-eximdsn-\d{8,10}/NNNNNNNNNN-eximdsn-MMMMMMMMMM/;
+ s/\d{8,10}-eximdsn-\d{7,10}/NNNNNNNNNN-eximdsn-MMMMMMMMMM/;

# ==========================================================
# Some munging is specific to the specific file types
diff --git a/test/stderr/0022 b/test/stderr/0022
index 65768e2..6451e75 100644
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -5,6 +5,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: accept propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -34,6 +35,7 @@ processing "accept"
accept: condition test succeeded in ACL "warn_empty"
end of ACL "warn_empty": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
@@ -69,6 +71,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: accept propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -101,6 +104,7 @@ processing "accept"
accept: condition test succeeded in ACL "warn_log"
end of ACL "warn_log": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
@@ -136,6 +140,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: accept propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -166,6 +171,7 @@ processing "accept"
accept: condition test succeeded in ACL "warn_user"
end of ACL "warn_user": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
diff --git a/test/stderr/0037 b/test/stderr/0037
index 208cda9..22ee0d2 100644
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -2,12 +2,24 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: check_vars propagating DSN
+DSN: fail_read_filter propagating DSN
+DSN: prepend_filter propagating DSN
+DSN: userfilter propagating DSN
+DSN: user_accept1 propagating DSN
+DSN: user_accept2 propagating DSN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: check_vars propagating DSN
+DSN: fail_read_filter propagating DSN
+DSN: prepend_filter propagating DSN
+DSN: userfilter propagating DSN
+DSN: user_accept1 propagating DSN
+DSN: user_accept2 propagating DSN
rda_interpret (file): TESTSUITE/aux-var/0037.F
expanded: TESTSUITE/aux-var/0037.F
ssss bytes read from TESTSUITE/aux-var/0037.F
diff --git a/test/stderr/0038 b/test/stderr/0038
index 2cde5de..9f1632d 100644
--- a/test/stderr/0038
+++ b/test/stderr/0038
@@ -7,6 +7,7 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> 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_rcpt"
>>> processing "warn"
@@ -44,6 +45,7 @@ LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> 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_rcpt"
>>> processing "warn"
@@ -80,6 +82,7 @@ LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> 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_rcpt"
>>> processing "warn"
@@ -117,6 +120,7 @@ LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> 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_rcpt"
>>> processing "warn"
@@ -153,6 +157,7 @@ LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> 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_rcpt"
>>> processing "warn"
@@ -218,6 +223,7 @@ LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> 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_rcpt2"
>>> processing "warn"
diff --git a/test/stderr/0043 b/test/stderr/0043
index 6ea0099..3c65514 100644
--- a/test/stderr/0043
+++ b/test/stderr/0043
@@ -7,6 +7,7 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> exim.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_recipient"
>>> processing "accept"
diff --git a/test/stderr/0044 b/test/stderr/0044
index 71453d6..b261277 100644
--- a/test/stderr/0044
+++ b/test/stderr/0044
@@ -7,6 +7,7 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> exim.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_recipient"
>>> processing "accept"
@@ -53,6 +54,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@??? H=(exim.test.ex) [V4NET.11.12.1
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> exim.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_recipient"
>>> processing "accept"
diff --git a/test/stderr/0070 b/test/stderr/0070
index 1df05cd..0453d22 100644
--- a/test/stderr/0070
+++ b/test/stderr/0070
@@ -266,6 +266,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in helo_try_verify_hosts? no (end of list)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> rhubarb 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 "rcpt"
>>> processing "require"
diff --git a/test/stderr/0078 b/test/stderr/0078
index 3d3ec33..c5d815f 100644
--- a/test/stderr/0078
+++ b/test/stderr/0078
@@ -1,6 +1,9 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: lookuphost propagating DSN
+DSN: self propagating DSN
+DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@???
--------> lookuphost router <--------
@@ -22,6 +25,9 @@ routed by lookuphost router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: lookuphost propagating DSN
+DSN: self propagating DSN
+DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing myhost.test.ex@???
--------> lookuphost router <--------
@@ -57,6 +63,9 @@ routed by self router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: lookuphost propagating DSN
+DSN: self propagating DSN
+DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@???
--------> lookuphost router <--------
@@ -106,6 +115,9 @@ routed by self2 router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: lookuphost propagating DSN
+DSN: self propagating DSN
+DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@???
--------> lookuphost router <--------
diff --git a/test/stderr/0079 b/test/stderr/0079
index 15a8ba9..1fb29be 100644
--- a/test/stderr/0079
+++ b/test/stderr/0079
@@ -7,6 +7,7 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> exim.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_recipient"
>>> processing "accept"
diff --git a/test/stderr/0080 b/test/stderr/0080
index 718dbba..c5a40d7 100644
--- a/test/stderr/0080
+++ b/test/stderr/0080
@@ -7,6 +7,7 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> exim.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_recipient"
>>> processing "accept"
diff --git a/test/stderr/0084 b/test/stderr/0084
index b520c34..d424cc0 100644
--- a/test/stderr/0084
+++ b/test/stderr/0084
@@ -1,6 +1,9 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: smart propagating DSN
+DSN: forward propagating DSN
+DSN: localuser propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing yes@???
--------> smart router <--------
diff --git a/test/stderr/0085 b/test/stderr/0085
index 92a8b70..fb68105 100644
--- a/test/stderr/0085
+++ b/test/stderr/0085
@@ -5,6 +5,9 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: smart1 propagating DSN
+DSN: fail_remote_domains propagating DSN
+DSN: smart2 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -204,6 +207,9 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: smart1 propagating DSN
+DSN: fail_remote_domains propagating DSN
+DSN: smart2 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
diff --git a/test/stderr/0094 b/test/stderr/0094
index 5346c5c..b9249cc 100644
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -71,6 +71,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: localuser propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -129,6 +130,7 @@ test.ex in "+local_domains"? yes (matched "+local_domains")
accept: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<userx@???>
using ACL "check_recipient"
processing "accept"
diff --git a/test/stderr/0117 b/test/stderr/0117
index 04352cc..18e159f 100644
--- a/test/stderr/0117
+++ b/test/stderr/0117
@@ -1,6 +1,7 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: lookuphost propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xxx@???
--------> lookuphost router <--------
@@ -22,6 +23,7 @@ routed by lookuphost router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: lookuphost propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xxx@???
--------> lookuphost router <--------
@@ -43,6 +45,7 @@ routed by lookuphost router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: lookuphost propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xxx@???
--------> lookuphost router <--------
diff --git a/test/stderr/0123 b/test/stderr/0123
index 22abb27..72eaef1 100644
--- a/test/stderr/0123
+++ b/test/stderr/0123
@@ -3,6 +3,12 @@ changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
+DSN: l1 propagating DSN
+DSN: l2 propagating DSN
+DSN: l3 propagating DSN
+DSN: c1 propagating DSN
+DSN: c2 propagating DSN
+DSN: c3 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git a/test/stderr/0138 b/test/stderr/0138
index c84420e..5a69cc1 100644
--- a/test/stderr/0138
+++ b/test/stderr/0138
@@ -7,6 +7,7 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> exim.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_recipient"
>>> processing "accept"
@@ -53,6 +54,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@??? H=(exim.test.ex) [V4NET.11.12.1
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> exim.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_recipient"
>>> processing "accept"

diff --git a/test/stderr/0143 b/test/stderr/0143
index 80d1ed3..054d65d 100644
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -24,6 +24,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
          250-HELP
          250 AUTH LOGIN
 not using PIPELINING
+use_dsn=0
   SMTP>> MAIL FROM:<CALLER@???>
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userx@???>
diff --git a/test/stderr/0149 b/test/stderr/0149
index b7a52aa..986177b 100644
--- a/test/stderr/0149
+++ b/test/stderr/0149
@@ -1,6 +1,9 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
+DSN: domainlist1 propagating DSN
+DSN: domainlist2 propagating DSN
+DSN: local propagating DSN

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing x@ten
--------> domainlist1 router <--------
diff --git a/test/stderr/0161 b/test/stderr/0161
index 250c73a..3a806f3 100644
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -1,6 +1,11 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: failuphost propagating DSN
+DSN: lookuphost propagating DSN
+DSN: fail propagating DSN
+DSN: self propagating DSN
+DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@???
--------> failuphost router <--------
@@ -27,6 +32,11 @@ routed by lookuphost router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: failuphost propagating DSN
+DSN: lookuphost propagating DSN
+DSN: fail propagating DSN
+DSN: self propagating DSN
+DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing myhost.test.ex@???
--------> failuphost router <--------
@@ -72,6 +82,11 @@ routed by self router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: failuphost propagating DSN
+DSN: lookuphost propagating DSN
+DSN: fail propagating DSN
+DSN: self propagating DSN
+DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@???
--------> failuphost router <--------
@@ -131,6 +146,11 @@ routed by self2 router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: failuphost propagating DSN
+DSN: lookuphost propagating DSN
+DSN: fail propagating DSN
+DSN: self propagating DSN
+DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@???
--------> failuphost router <--------
@@ -151,6 +171,11 @@ no more routers
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: failuphost propagating DSN
+DSN: lookuphost propagating DSN
+DSN: fail propagating DSN
+DSN: self propagating DSN
+DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing ff@???
--------> failuphost router <--------
@@ -166,6 +191,11 @@ failuphost router forced address failure
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: failuphost propagating DSN
+DSN: lookuphost propagating DSN
+DSN: fail propagating DSN
+DSN: self propagating DSN
+DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing fff@???
--------> failuphost router <--------
diff --git a/test/stderr/0180 b/test/stderr/0180
index 5162576..4fa5388 100644
--- a/test/stderr/0180
+++ b/test/stderr/0180
@@ -7,6 +7,7 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> some.host 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 hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
@@ -17,4 +18,5 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> some.host in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts? yes (matched "*")
diff --git a/test/stderr/0183 b/test/stderr/0183
index 9faf631..b5e5deb 100644
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -3,6 +3,9 @@ changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
+DSN: srv propagating DSN
+DSN: useryz propagating DSN
+DSN: lookuphost propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -193,6 +196,9 @@ changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
+DSN: srv propagating DSN
+DSN: useryz propagating DSN
+DSN: lookuphost propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -381,6 +387,9 @@ changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
+DSN: srv propagating DSN
+DSN: useryz propagating DSN
+DSN: lookuphost propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -571,6 +580,9 @@ changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
+DSN: srv propagating DSN
+DSN: useryz propagating DSN
+DSN: lookuphost propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git a/test/stderr/0243 b/test/stderr/0243
index 605febb..9b8717f 100644
--- a/test/stderr/0243
+++ b/test/stderr/0243
@@ -7,6 +7,7 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> xxxx 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_recipient"
>>> processing "deny"
diff --git a/test/stderr/0275 b/test/stderr/0275
index 79cdb9d..a634ad5 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -5,6 +5,15 @@ configuration file is TESTSUITE/test-config
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: r00 propagating DSN
+DSN: r01 propagating DSN
+DSN: r02 propagating DSN
+DSN: r03 propagating DSN
+DSN: r04 propagating DSN
+DSN: r05 propagating DSN
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -106,6 +115,15 @@ changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: r00 propagating DSN
+DSN: r01 propagating DSN
+DSN: r02 propagating DSN
+DSN: r03 propagating DSN
+DSN: r04 propagating DSN
+DSN: r05 propagating DSN
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
@@ -132,6 +150,10 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |userx@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
@@ -146,6 +168,15 @@ trusted user
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: r00 propagating DSN
+DSN: r01 propagating DSN
+DSN: r02 propagating DSN
+DSN: r03 propagating DSN
+DSN: r04 propagating DSN
+DSN: r05 propagating DSN
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaX-0005vi-00
reading spool file 10HmaX-0005vi-00-H
@@ -155,7 +186,9 @@ Non-recipients:
Empty Tree
---- End of tree ----
recipients_count=1
+**** SPOOL_IN - No additional fields
body_linecount=0 message_linecount=7
+DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@???
locking TESTSUITE/spool/db/retry.lockfile
@@ -301,6 +334,14 @@ userx@???: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
+DSN: processing router : r3
+DSN: processing successful delivery address: userx@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL flags: 0
+DSN: envid: NULL ret: 0
+DSN: Final recipient: userx@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/0278 b/test/stderr/0278
index 39c5a56..062aaaf 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -5,6 +5,11 @@ configuration file is TESTSUITE/test-config
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
+DSN: r4 propagating DSN
+DSN: r5 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -65,6 +70,11 @@ changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
+DSN: r4 propagating DSN
+DSN: r5 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
@@ -91,6 +101,10 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |CALLER@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
@@ -105,6 +119,11 @@ trusted user
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
+DSN: r4 propagating DSN
+DSN: r5 propagating DSN
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaX-0005vi-00
reading spool file 10HmaX-0005vi-00-H
@@ -114,7 +133,9 @@ Non-recipients:
Empty Tree
---- End of tree ----
recipients_count=1
+**** SPOOL_IN - No additional fields
body_linecount=0 message_linecount=7
+DSN: set orcpt: NULL flags: 0
Delivery address list:
CALLER@???
locking TESTSUITE/spool/db/retry.lockfile
@@ -215,6 +236,14 @@ CALLER@???: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
+DSN: processing router : r3
+DSN: processing successful delivery address: CALLER@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL flags: 0
+DSN: envid: NULL ret: 0
+DSN: Final recipient: CALLER@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
@@ -230,6 +259,11 @@ configuration file is TESTSUITE/test-config
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
+DSN: r4 propagating DSN
+DSN: r5 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git a/test/stderr/0279 b/test/stderr/0279
index a56ebe9..efc549d 100644
--- a/test/stderr/0279
+++ b/test/stderr/0279
@@ -8,6 +8,10 @@ trusted user
admin user
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: rr1 propagating DSN
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=
sender address = CALLER@???
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -80,6 +84,10 @@ trusted user
admin user
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: rr1 propagating DSN
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=
sender address = user1@fun.1
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git a/test/stderr/0294 b/test/stderr/0294
index 3626750..24da1eb 100644
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -12,18 +12,23 @@ SMTP<< mail from:<x@y>
SMTP>> 250 OK
SMTP<< rcpt to:<one@z>
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<one@z>
rate limit RCPT: delay 0.25 sec
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<one@z>
rate limit RCPT: delay 0.263 sec
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<one@z>
rate limit RCPT: delay 0.276 sec
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<one@z>
rate limit RCPT: delay 0.289 sec
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
>>Headers received:
@@ -52,6 +57,7 @@ rate limit MAIL: delay 1 sec
SMTP>> 250 OK
SMTP<< rcpt to:<two@z>
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
>>Headers received:
@@ -112,6 +118,7 @@ processing "accept"
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<one@z>
host in smtp_ratelimit_hosts? no (end of list)
processing "deny"
@@ -122,6 +129,7 @@ processing "accept"
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
@@ -156,6 +164,7 @@ processing "accept"
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<one@z>
host in smtp_ratelimit_hosts? yes (matched "V4NET.9.8.7")
rate limit RCPT: delay 0.25 sec
@@ -167,6 +176,7 @@ processing "accept"
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
diff --git a/test/stderr/0297 b/test/stderr/0297
index 82695a1..9eb7593 100644
--- a/test/stderr/0297
+++ b/test/stderr/0297
@@ -2,6 +2,7 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing /a/b/c@???
--------> r1 router <--------
@@ -25,6 +26,7 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing /x/y/z@???
--------> r1 router <--------
diff --git a/test/stderr/0303 b/test/stderr/0303
index a1da41f..3f90c7c 100644
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -30,6 +30,7 @@ MUNGED: ::1 will be omitted in what follows
>>> name=ten-1.test.ex address=V4NET.0.0.1
>>> checking addresses for ten-1.test.ex
>>> V4NET.0.0.1 OK
+>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts? yes (matched "*")
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
@@ -72,6 +73,7 @@ SMTP<< EHLO [V4NET.2.3.4]
sender_fullhost = ([V4NET.2.3.4]) [V4NET.2.3.4]
sender_rcvhost = [V4NET.2.3.4]
set_process_info: pppp handling incoming connection from ([V4NET.2.3.4]) [V4NET.2.3.4]
+host in dsn_advertise_hosts? no (option unset)
host in pipelining_advertise_hosts? yes (matched "*")
SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4]
250-SIZE 52428800
@@ -85,6 +87,7 @@ processing "accept"
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
@@ -142,6 +145,7 @@ SMTP<< EHLO [V4NET.2.3.4]
sender_fullhost = host.name.tld [V4NET.2.3.4]
sender_rcvhost = host.name.tld ([V4NET.2.3.4])
set_process_info: pppp handling incoming connection from host.name.tld [V4NET.2.3.4]
+host in dsn_advertise_hosts? no (option unset)
host in pipelining_advertise_hosts? yes (matched "*")
SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4]
250-SIZE 52428800
@@ -155,6 +159,7 @@ processing "accept"
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
diff --git a/test/stderr/0315 b/test/stderr/0315
index 80a16f5..1c3e974 100644
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -1,6 +1,8 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@ -8,6 +10,8 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
delivering 10HmaX-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
@@ -59,12 +63,16 @@ LOG: MAIN
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
delivering 10HmaY-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
diff --git a/test/stderr/0332 b/test/stderr/0332
index d778347..7dea915 100644
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -1,6 +1,8 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp
locking TESTSUITE/spool/db/retry.lockfile
@@ -41,6 +43,8 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: delay@???
diff --git a/test/stderr/0333 b/test/stderr/0333
index b7c11d6..595f0f8 100644
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -1,6 +1,8 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: ok@???
@@ -40,6 +42,8 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: delay@???
diff --git a/test/stderr/0360 b/test/stderr/0360
index 70b77eb..527e378 100644
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -1,6 +1,9 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: v0 propagating DSN
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@ -8,6 +11,9 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: v0 propagating DSN
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
delivering 10HmaX-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
@@ -149,6 +155,9 @@ LOG: MAIN
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: v0 propagating DSN
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
diff --git a/test/stderr/0361 b/test/stderr/0361
index 07e0ce3..5b93c6e 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -12,6 +12,10 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
+DSN: r4 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -40,6 +44,10 @@ P Received: from CALLER by the.local.host.name with local (Exim x.yz)
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |kilos@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
@@ -51,6 +59,10 @@ changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
+DSN: r4 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@ -62,7 +74,9 @@ Non-recipients:
Empty Tree
---- End of tree ----
recipients_count=1
+**** SPOOL_IN - No additional fields
body_linecount=0 message_linecount=7
+DSN: set orcpt: NULL flags: 0
Delivery address list:
kilos@???
locking TESTSUITE/spool/db/retry.lockfile
@@ -219,6 +233,22 @@ LOG: MAIN
changed uid/gid: post-delivery tidying
uid=EXIM_UID gid=EXIM_GID pid=pppp
set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00
+DSN: processing router : r4
+DSN: processing successful delivery address: kilos@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL flags: 0
+DSN: envid: NULL ret: 0
+DSN: Final recipient: kilos@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: processing router : r3
+DSN: processing successful delivery address: kilos@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL flags: 0
+DSN: envid: NULL ret: 0
+DSN: Final recipient: kilos@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
LOG: MAIN
Completed
end delivery of 10HmaY-0005vi-00
diff --git a/test/stderr/0362 b/test/stderr/0362
index 5f03562..c2b6e25 100644
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -5,6 +5,8 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -75,6 +77,7 @@ routed by r2 router
accept: condition test succeeded in ACL "check_rcpt"
end of ACL "check_rcpt": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< quit
SMTP>> 221 the.local.host.name closing connection
LOG: smtp_connection MAIN
diff --git a/test/stderr/0364 b/test/stderr/0364
index c8d6b0d..f648839 100644
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -1,6 +1,11 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
+DSN: r4 propagating DSN
+DSN: r5 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing kilos@thishost
--------> r1 router <--------
diff --git a/test/stderr/0371 b/test/stderr/0371
index df1a378..534a643 100644
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -35,6 +35,7 @@ something in helo_lookup_domains? no (end of list)
sender_fullhost = (something) [V4NET.0.0.0]
sender_rcvhost = [V4NET.0.0.0] (helo=something)
set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0]
+host in dsn_advertise_hosts? no (option unset)
host in pipelining_advertise_hosts? yes (matched "*")
SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
250-SIZE 52428800
@@ -65,6 +66,7 @@ check set acl_c0 = $acl_c0; rcpt
accept: condition test succeeded in ACL "rcpt"
end of ACL "rcpt": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
diff --git a/test/stderr/0374 b/test/stderr/0374
index 05bc246..c816371 100644
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -1,6 +1,11 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: u1 propagating DSN
+DSN: ut2 propagating DSN
+DSN: ut3 propagating DSN
+DSN: ut4 propagating DSN
+DSN: real propagating DSN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@ -8,6 +13,11 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: u1 propagating DSN
+DSN: ut2 propagating DSN
+DSN: ut3 propagating DSN
+DSN: ut4 propagating DSN
+DSN: real propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -380,12 +390,22 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: u1 propagating DSN
+DSN: ut2 propagating DSN
+DSN: ut3 propagating DSN
+DSN: ut4 propagating DSN
+DSN: real propagating DSN
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: u1 propagating DSN
+DSN: ut2 propagating DSN
+DSN: ut3 propagating DSN
+DSN: ut4 propagating DSN
+DSN: real propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: CALLER@???
diff --git a/test/stderr/0375 b/test/stderr/0375
index 6135f0f..8b59feb 100644
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -1,6 +1,15 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: u1 propagating DSN
+DSN: ut2 propagating DSN
+DSN: ut3 propagating DSN
+DSN: ut4 propagating DSN
+DSN: ut5 propagating DSN
+DSN: ut6 propagating DSN
+DSN: ut7 propagating DSN
+DSN: ut8 propagating DSN
+DSN: real propagating DSN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@ -8,6 +17,15 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: u1 propagating DSN
+DSN: ut2 propagating DSN
+DSN: ut3 propagating DSN
+DSN: ut4 propagating DSN
+DSN: ut5 propagating DSN
+DSN: ut6 propagating DSN
+DSN: ut7 propagating DSN
+DSN: ut8 propagating DSN
+DSN: real propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -840,12 +858,30 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: u1 propagating DSN
+DSN: ut2 propagating DSN
+DSN: ut3 propagating DSN
+DSN: ut4 propagating DSN
+DSN: ut5 propagating DSN
+DSN: ut6 propagating DSN
+DSN: ut7 propagating DSN
+DSN: ut8 propagating DSN
+DSN: real propagating DSN
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: u1 propagating DSN
+DSN: ut2 propagating DSN
+DSN: ut3 propagating DSN
+DSN: ut4 propagating DSN
+DSN: ut5 propagating DSN
+DSN: ut6 propagating DSN
+DSN: ut7 propagating DSN
+DSN: ut8 propagating DSN
+DSN: real propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: CALLER@???
@@ -924,12 +960,30 @@ log writing disabled
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: u1 propagating DSN
+DSN: ut2 propagating DSN
+DSN: ut3 propagating DSN
+DSN: ut4 propagating DSN
+DSN: ut5 propagating DSN
+DSN: ut6 propagating DSN
+DSN: ut7 propagating DSN
+DSN: ut8 propagating DSN
+DSN: real propagating DSN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: u1 propagating DSN
+DSN: ut2 propagating DSN
+DSN: ut3 propagating DSN
+DSN: ut4 propagating DSN
+DSN: ut5 propagating DSN
+DSN: ut6 propagating DSN
+DSN: ut7 propagating DSN
+DSN: ut8 propagating DSN
+DSN: real propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: h1@???
diff --git a/test/stderr/0377 b/test/stderr/0377
index 3a70bb6..ca39498 100644
--- a/test/stderr/0377
+++ b/test/stderr/0377
@@ -1,6 +1,14 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: defer propagating DSN
+DSN: unseen_aaaa propagating DSN
+DSN: seen_aaaa propagating DSN
+DSN: bbbb propagating DSN
+DSN: bbbb_0 propagating DSN
+DSN: cccc_2nd_time propagating DSN
+DSN: cccc_redirect propagating DSN
+DSN: cccc_accept propagating DSN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@ -8,6 +16,14 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: defer propagating DSN
+DSN: unseen_aaaa propagating DSN
+DSN: seen_aaaa propagating DSN
+DSN: bbbb propagating DSN
+DSN: bbbb_0 propagating DSN
+DSN: cccc_2nd_time propagating DSN
+DSN: cccc_redirect propagating DSN
+DSN: cccc_accept propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -312,6 +328,14 @@ locking TESTSUITE/spool/db/retry.lockfile
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: defer propagating DSN
+DSN: unseen_aaaa propagating DSN
+DSN: seen_aaaa propagating DSN
+DSN: bbbb propagating DSN
+DSN: bbbb_0 propagating DSN
+DSN: cccc_2nd_time propagating DSN
+DSN: cccc_redirect propagating DSN
+DSN: cccc_accept propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
@@ -555,6 +579,14 @@ LOG: queue_run MAIN
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: defer propagating DSN
+DSN: unseen_aaaa propagating DSN
+DSN: seen_aaaa propagating DSN
+DSN: bbbb propagating DSN
+DSN: bbbb_0 propagating DSN
+DSN: cccc_2nd_time propagating DSN
+DSN: cccc_redirect propagating DSN
+DSN: cccc_accept propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
diff --git a/test/stderr/0378 b/test/stderr/0378
index 13db924..bb7b4a4 100644
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -1,6 +1,10 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: bounce propagating DSN
+DSN: defer propagating DSN
+DSN: aaaa_2nd_time propagating DSN
+DSN: aaaa propagating DSN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@ -8,6 +12,10 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: bounce propagating DSN
+DSN: defer propagating DSN
+DSN: aaaa_2nd_time propagating DSN
+DSN: aaaa propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -121,12 +129,20 @@ locking TESTSUITE/spool/db/retry.lockfile
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: bounce propagating DSN
+DSN: defer propagating DSN
+DSN: aaaa_2nd_time propagating DSN
+DSN: aaaa propagating DSN
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: bounce propagating DSN
+DSN: defer propagating DSN
+DSN: aaaa_2nd_time propagating DSN
+DSN: aaaa propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -172,6 +188,10 @@ locking TESTSUITE/spool/db/retry.lockfile
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: bounce propagating DSN
+DSN: defer propagating DSN
+DSN: aaaa_2nd_time propagating DSN
+DSN: aaaa propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
diff --git a/test/stderr/0379 b/test/stderr/0379
index 142b65d..7f0c700 100644
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -1,6 +1,9 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: defer propagating DSN
+DSN: aaaa_redirect propagating DSN
+DSN: bc propagating DSN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@ -8,6 +11,9 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: defer propagating DSN
+DSN: aaaa_redirect propagating DSN
+DSN: bc propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -136,6 +142,9 @@ locking TESTSUITE/spool/db/retry.lockfile
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: defer propagating DSN
+DSN: aaaa_redirect propagating DSN
+DSN: bc propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
diff --git a/test/stderr/0380 b/test/stderr/0380
index e7ae5a2..4c31b57 100644
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -1,6 +1,10 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: r0 propagating DSN
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@ -8,6 +12,10 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r0 propagating DSN
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git a/test/stderr/0381 b/test/stderr/0381
index c1ead3f..a24ef41 100644
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -75,6 +75,7 @@ processing "accept"
accept: condition test succeeded in ACL "check_rcpt"
end of ACL "check_rcpt": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
diff --git a/test/stderr/0384 b/test/stderr/0384
index 7a0eb83..63ba003 100644
--- a/test/stderr/0384
+++ b/test/stderr/0384
@@ -8,6 +8,7 @@
>>> [V4NET.9.8.7] in helo_lookup_domains? no (end of list)
>>> verifying EHLO/HELO argument "[V4NET.9.8.7]"
>>> matched host address
+>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts? yes (matched "*")
>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
>>> [1.2.3.4] in helo_lookup_domains? no (end of list)
diff --git a/test/stderr/0386 b/test/stderr/0386
index 6084853..086297c 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -8,6 +8,7 @@ trusted user
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -134,6 +135,7 @@ trusted user
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -179,6 +181,7 @@ processing "accept"
accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
end of ACL "TESTSUITE/aux-fixed/0386.acl2": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
@@ -202,6 +205,10 @@ P Received: from [V4NET.11.12.13] (ident=CALLER)
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |2@b| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
LOG: MAIN
<= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
@@ -216,6 +223,7 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@ -229,7 +237,9 @@ Non-recipients:
Empty Tree
---- End of tree ----
recipients_count=1
+**** SPOOL_IN - No additional fields
body_linecount=1 message_linecount=7
+DSN: set orcpt: NULL flags: 0
Delivery address list:
2@b
locking TESTSUITE/spool/db/retry.lockfile
@@ -312,6 +322,14 @@ Succeeded addresses:
Failed addresses:
Deferred addresses:
end of retry processing
+DSN: processing router : r1
+DSN: processing successful delivery address: 2@b
+DSN: Sender_address: x@y
+DSN: orcpt: NULL flags: 0
+DSN: envid: NULL ret: 0
+DSN: Final recipient: 2@b
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
@@ -340,6 +358,7 @@ processing "accept"
accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
end of ACL "TESTSUITE/aux-fixed/0386.acl2": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
@@ -363,6 +382,10 @@ P Received: from [V4NET.11.12.13] (ident=CALLER)
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |2@b| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
LOG: MAIN
<= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
@@ -377,6 +400,7 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@ -390,7 +414,9 @@ Non-recipients:
Empty Tree
---- End of tree ----
recipients_count=1
+**** SPOOL_IN - No additional fields
body_linecount=1 message_linecount=7
+DSN: set orcpt: NULL flags: 0
Delivery address list:
2@b
locking TESTSUITE/spool/db/retry.lockfile
@@ -472,6 +498,14 @@ Succeeded addresses:
Failed addresses:
Deferred addresses:
end of retry processing
+DSN: processing router : r1
+DSN: processing successful delivery address: 2@b
+DSN: Sender_address: x@y
+DSN: orcpt: NULL flags: 0
+DSN: envid: NULL ret: 0
+DSN: Final recipient: 2@b
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
LOG: MAIN
Completed
end delivery of 10HmaY-0005vi-00
diff --git a/test/stderr/0388 b/test/stderr/0388
index a7a2664..e9e8c7b 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -3,6 +3,8 @@ changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
+DSN: r0 propagating DSN
+DSN: r1 propagating DSN
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaX-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
@@ -168,6 +170,8 @@ trusted user
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r0 propagating DSN
+DSN: r1 propagating DSN
originator: uid=EXIM_UID gid=EXIM_GID login=EXIMUSER name=
sender address =
set_process_info: pppp accepting a local non-SMTP message from <>
@@ -178,6 +182,8 @@ X-Failed-Recipients: x@y
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender

rewrite_one_header: type=F:
@@ -190,6 +196,8 @@ search_tidyup called
Auto-Submitted: auto-replied
F From: Mail Delivery System <Mailer-Daemon@???>
T To: CALLER@???
+ Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+ MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
I Message-Id: <E10HmaY-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -213,6 +221,8 @@ changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r0 propagating DSN
+DSN: r1 propagating DSN
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaY-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
diff --git a/test/stderr/0391 b/test/stderr/0391
index 3268077..31fd790 100644
--- a/test/stderr/0391
+++ b/test/stderr/0391
@@ -5,6 +5,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
sender_fullhost = [1.2.3.4]
@@ -57,6 +58,7 @@ sender U@??? verified ok as U@???
accept: condition test succeeded in ACL "acl_rcpt"
end of ACL "acl_rcpt": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
diff --git a/test/stderr/0398 b/test/stderr/0398
index 5118c1a..31d3fc2 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -5,6 +5,8 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -158,6 +160,7 @@ qq@remote in "qq@remote"? yes (matched "qq@remote")
accept: condition test succeeded in ACL "rcpt"
end of ACL "rcpt": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<xyz@local>
using ACL "rcpt"
processing "deny"
@@ -237,6 +240,7 @@ qq@remote in "qq@remote"? yes (matched "qq@remote")
accept: condition test succeeded in ACL "rcpt"
end of ACL "rcpt": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< quit
SMTP>> 221 mail.test.ex closing connection

 LOG: smtp_connection MAIN
diff --git a/test/stderr/0399 b/test/stderr/0399
index c6fb813..2e7ccc7 100644
--- a/test/stderr/0399
+++ b/test/stderr/0399
@@ -3,6 +3,9 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@???
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git a/test/stderr/0402 b/test/stderr/0402
index 20c2e7b..ec373f5 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -5,6 +5,11 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
+DSN: r4 propagating DSN
+DSN: r5 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 seeking password data for user "CALLER": using cached result
@@ -84,6 +89,18 @@ local_scan() returned 0 NULL
 expanding: ${tod_full}
    result: Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |CALLER@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |usery@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |userz@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |rd+CALLER@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |rd+usery@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
 Size of headers = sss
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
@@ -96,6 +113,11 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
+DSN: r4 propagating DSN
+DSN: r5 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 seeking password data for user "CALLER": using cached result
@@ -111,7 +133,17 @@ Non-recipients:
 Empty Tree
 ---- End of tree ----
 recipients_count=5
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
 body_linecount=0 message_linecount=6
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
 Delivery address list:
   CALLER@??? 
   usery@??? 
@@ -529,6 +561,62 @@ rd+usery@???: no retry items
 Failed addresses:
 Deferred addresses:
 end of retry processing
+DSN: processing router : r3
+DSN: processing successful delivery address: userz@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL  flags: 0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: userz@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: processing router : r2
+DSN: processing successful delivery address: usery@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL  flags: 0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: usery@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: processing router : r1
+DSN: processing successful delivery address: CALLER@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL  flags: 0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: CALLER@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: processing router : r4
+DSN: processing successful delivery address: TESTSUITE/test-mail/junk
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL  flags: 0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: TESTSUITE/test-mail/junk
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: processing router : r5
+DSN: processing successful delivery address: TESTSUITE/test-mail/junk
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL  flags: 0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: TESTSUITE/test-mail/junk
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: processing router : r4
+DSN: processing successful delivery address: rd+CALLER@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL  flags: 0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: rd+CALLER@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: processing router : r5
+DSN: processing successful delivery address: rd+usery@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL  flags: 0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: rd+usery@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
 LOG: MAIN
   Completed
 end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/0403 b/test/stderr/0403
index ebc7683..27b209d 100644
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -5,6 +5,7 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -33,6 +34,10 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |userx@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
 Size of headers = sss
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
@@ -45,6 +50,7 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
+DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
@@ -56,7 +62,9 @@ Non-recipients:
 Empty Tree
 ---- End of tree ----
 recipients_count=1
+**** SPOOL_IN - No additional fields
 body_linecount=0 message_linecount=7
+DSN: set orcpt: NULL  flags: 0
 Delivery address list:
   userx@??? 
 locking TESTSUITE/spool/db/retry.lockfile
@@ -176,6 +184,22 @@ LOG: MAIN
 changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
+DSN: processing router : r1
+DSN: processing successful delivery address: TESTSUITE/test-mail/junk
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL  flags: 0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: TESTSUITE/test-mail/junk
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: processing router : r1
+DSN: processing successful delivery address: userx@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL  flags: 0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: userx@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
 LOG: MAIN
   Completed
 end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/0404 b/test/stderr/0404
index d37788c..9d04fe5 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -7,6 +7,8 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -132,6 +134,10 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |userx@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
 Size of headers = sss
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
@@ -146,6 +152,8 @@ trusted user
 admin user
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
@@ -157,7 +165,9 @@ Non-recipients:
 Empty Tree
 ---- End of tree ----
 recipients_count=1
+**** SPOOL_IN - No additional fields
 body_linecount=0 message_linecount=159
+DSN: set orcpt: NULL  flags: 0
 Delivery address list:
   userx@??? 
 locking TESTSUITE/spool/db/retry.lockfile
@@ -244,6 +254,8 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -281,6 +293,1224 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |sender@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
 Size of headers = sss
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
@@ -294,6 +1524,8 @@ trusted user
 admin user
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
@@ -305,7 +1537,1223 @@ Non-recipients:
 Empty Tree
 ---- End of tree ----
 recipients_count=608
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
+**** SPOOL_IN - No additional fields
 body_linecount=1 message_linecount=9
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
+DSN: set orcpt: NULL  flags: 0
 Delivery address list:
   sender@??? 
   sender@??? 
@@ -15565,6 +18013,14 @@ sender@???: no retry items
 Failed addresses:
 Deferred addresses:
 end of retry processing
+DSN: processing router : r1
+DSN: processing successful delivery address: sender@???
+DSN: Sender_address: 
+DSN: orcpt: NULL  flags: 0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: sender@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
 LOG: MAIN
   Completed
 end delivery of 10HmaY-0005vi-00
@@ -15594,6 +18050,22 @@ userx@???: no retry items
 Failed addresses:
 Deferred addresses:
 end of retry processing
+DSN: processing router : r2
+DSN: processing successful delivery address: >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL  flags: 0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: processing router : r2
+DSN: processing successful delivery address: userx@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL  flags: 0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: userx@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
 LOG: MAIN
   Completed
 end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/0408 b/test/stderr/0408
index 8eeab81..f578e30 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -5,6 +5,7 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -33,6 +34,10 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |userx@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
 Size of headers = sss
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
@@ -45,6 +50,7 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
+DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
@@ -56,7 +62,9 @@ Non-recipients:
 Empty Tree
 ---- End of tree ----
 recipients_count=1
+**** SPOOL_IN - No additional fields
 body_linecount=0 message_linecount=7
+DSN: set orcpt: NULL  flags: 0
 Delivery address list:
   userx@??? 
 locking TESTSUITE/spool/db/retry.lockfile
@@ -166,6 +174,14 @@ userx@???: no retry items
 Failed addresses:
 Deferred addresses:
 end of retry processing
+DSN: processing router : r1
+DSN: processing successful delivery address: userx@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL  flags: 0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: userx@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
 LOG: MAIN
   Completed
 end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/0414 b/test/stderr/0414
index 20fa2bc..06a9e7f 100644
--- a/test/stderr/0414
+++ b/test/stderr/0414
@@ -3,6 +3,9 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
diff --git a/test/stderr/0419 b/test/stderr/0419
index 307e827..5fc9500 100644
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -5,6 +5,7 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: dnslookup propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@???
 Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
diff --git a/test/stderr/0420 b/test/stderr/0420
index 34f575e..1bf9787 100644
--- a/test/stderr/0420
+++ b/test/stderr/0420
@@ -29,6 +29,7 @@ processing "accept"
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT

SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
@@ -54,6 +55,7 @@ processing "accept"
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
diff --git a/test/stderr/0426 b/test/stderr/0426
index 2be2c7d..498ef1e 100644
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -1,6 +1,8 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: r0 propagating DSN
+DSN: r1 propagating DSN
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@ -8,6 +10,8 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r0 propagating DSN
+DSN: r1 propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -53,12 +57,16 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r0 propagating DSN
+DSN: r1 propagating DSN
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r0 propagating DSN
+DSN: r1 propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git a/test/stderr/0432 b/test/stderr/0432
index a9581e9..00dfde2 100644
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -31,6 +31,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
sender_fullhost = [1.2.3.4]
@@ -127,6 +128,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
sender_fullhost = [1.2.3.4]
diff --git a/test/stderr/0463 b/test/stderr/0463
index 22244b9..2c6fc05 100644
--- a/test/stderr/0463
+++ b/test/stderr/0463
@@ -3,6 +3,7 @@ changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
+DSN: all propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git a/test/stderr/0464 b/test/stderr/0464
index b405a81..cf094ce 100644
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -5,6 +5,8 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
set_process_info: pppp accepting a local SMTP message from <CALLER@???>
@@ -165,6 +167,7 @@ processing "accept"
accept: condition test succeeded in ACL "rcpt"
end of ACL "rcpt": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
diff --git a/test/stderr/0465 b/test/stderr/0465
index 634cd21..f86dc46 100644
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -54,6 +54,7 @@ processing "accept"
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
@@ -81,6 +82,10 @@ end of ACL "check_data": ACCEPT
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |abc@domain| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
LOG: MAIN
<= <> U=CALLER P=local-smtp S=sss
@@ -118,6 +123,7 @@ processing "accept"
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself

 search_tidyup called
diff --git a/test/stderr/0469 b/test/stderr/0469
index d78e5a4..eff873f 100644
--- a/test/stderr/0469
+++ b/test/stderr/0469
@@ -3,6 +3,7 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
+DSN: r1 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@???
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git a/test/stderr/0471 b/test/stderr/0471
index 273100d..1c860c2 100644
--- a/test/stderr/0471
+++ b/test/stderr/0471
@@ -25375,6 +25375,10 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |r1@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
 Size of headers = sss
 LOG: MAIN
   <= CALLER@??? U=CALLER P=local S=sss
diff --git a/test/stderr/0476 b/test/stderr/0476
index f0dc336..919413c 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -23,6 +23,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
          250-PIPELINING
          250 OK
 using PIPELINING
+use_dsn=0
   SMTP>> MAIL FROM:<CALLER@???>
   SMTP>> RCPT TO:<userx@???>
   SMTP>> DATA
diff --git a/test/stderr/0479 b/test/stderr/0479
index fe0190e..a5e9f82 100644
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -5,6 +5,7 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@???
 sender_fullhost = [1.2.3.4]
@@ -69,6 +70,7 @@ processing "accept"
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT

SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<e@f>
using ACL "rcpt"
processing "require"
@@ -83,6 +85,7 @@ processing "accept"
accept: condition test succeeded in ACL "rcpt"
end of ACL "rcpt": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< quit
SMTP>> 221 the.local.host.name closing connection
LOG: smtp_connection MAIN
diff --git a/test/stderr/0483 b/test/stderr/0483
index ea6dc91..280b971 100644
--- a/test/stderr/0483
+++ b/test/stderr/0483
@@ -1,6 +1,7 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: r1 propagating DSN
LOG: smtp_connection MAIN
SMTP connection from CALLER
LOG: MAIN
diff --git a/test/stderr/0487 b/test/stderr/0487
index 4f2bbc2..e3217ab 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -8,6 +8,7 @@ trusted user
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -19,6 +20,7 @@ LOG: smtp_connection MAIN
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< ehlo x.y
+ in dsn_advertise_hosts? no (option unset)
in pipelining_advertise_hosts? yes (matched "*")
SMTP>> 250-myhost.test.ex Hello CALLER at x.y
250-SIZE 52428800
@@ -32,6 +34,7 @@ processing "accept"
accept: condition test succeeded in inline ACL
end of inline ACL: ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
@@ -56,6 +59,10 @@ P Received: from CALLER (helo=x.y)
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |userx@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
LOG: MAIN
<= x@y U=CALLER P=local-esmtp S=sss
@@ -71,6 +78,7 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@ -82,7 +90,9 @@ Non-recipients:
Empty Tree
---- End of tree ----
recipients_count=1
+**** SPOOL_IN - No additional fields
body_linecount=1 message_linecount=8
+DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@???
locking TESTSUITE/spool/db/retry.lockfile
@@ -167,6 +177,14 @@ userx@???: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
+DSN: processing router : r1
+DSN: processing successful delivery address: userx@???
+DSN: Sender_address: x@y
+DSN: orcpt: NULL flags: 0
+DSN: envid: NULL ret: 0
+DSN: Final recipient: userx@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/0499 b/test/stderr/0499
index 13b4d4f..4592f64 100644
--- a/test/stderr/0499
+++ b/test/stderr/0499
@@ -3,6 +3,7 @@ changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
+DSN: r1 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git a/test/stderr/0513 b/test/stderr/0513
index b889bc0..9825070 100644
--- a/test/stderr/0513
+++ b/test/stderr/0513
@@ -7,6 +7,7 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> a.b.c.d 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_rcpt"
>>> processing "defer"
diff --git a/test/stderr/0514 b/test/stderr/0514
index 0efd7cc..22f78df 100644
--- a/test/stderr/0514
+++ b/test/stderr/0514
@@ -13,4 +13,5 @@ Non-recipients:
Empty Tree
---- End of tree ----
recipients_count=1
+**** SPOOL_IN - No additional fields
body_linecount=1 message_linecount=0
diff --git a/test/stderr/0524 b/test/stderr/0524
index 22b7888..363c8df 100644
--- a/test/stderr/0524
+++ b/test/stderr/0524
@@ -7,6 +7,7 @@
>>> 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"
@@ -16,6 +17,7 @@
>>> 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"
@@ -33,6 +35,7 @@ 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"
@@ -43,6 +46,7 @@ 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)
+>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts? yes (matched "*")
>>> using ACL "check_mail"
>>> processing "accept"
diff --git a/test/stderr/0537 b/test/stderr/0537
index f6ad3ba..a892e73 100644
--- a/test/stderr/0537
+++ b/test/stderr/0537
@@ -86,6 +86,7 @@ LOG: sender_ident=ident
>>> end of ACL "log": ACCEPT
>>> accept: condition test succeeded in ACL "connect"
>>> end of ACL "connect": ACCEPT
+>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts? yes (matched "*")
>>> using ACL "mail"
>>> processing "accept"
diff --git a/test/stderr/0543 b/test/stderr/0543
index 3aa07da..6a2b4cc 100644
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -1,6 +1,7 @@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
+DSN: smarthost propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp
locking TESTSUITE/spool/db/retry.lockfile
diff --git a/test/stderr/0545 b/test/stderr/0545
index ddd5bcc..5baf95f 100644
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -3,6 +3,7 @@ changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
+DSN: dns propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -72,6 +73,7 @@ changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
+DSN: dns propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git a/test/stderr/0563 b/test/stderr/0563
index 29de6a3..fc4933c 100644
--- a/test/stderr/0563
+++ b/test/stderr/0563
@@ -5,6 +5,8 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: router1 propagating DSN
+DSN: router2 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_GECOS
sender address = CALLER@???
Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
diff --git a/test/stderr/2201 b/test/stderr/2201
index 9d70d2a..925d3c6 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -6,6 +6,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
diff --git a/test/stderr/2600 b/test/stderr/2600
index 35b8141..8c0bdb0 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -111,6 +111,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -204,6 +205,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -248,6 +250,7 @@ host in "+relay_hosts"? yes (matched "+relay_hosts")
accept: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< rcpt to:<c@d>
using ACL "check_recipient"
processing "accept"
@@ -272,6 +275,7 @@ host in "+relay_hosts"? yes (matched "+relay_hosts")
accept: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": ACCEPT
SMTP>> 250 Accepted
+DSN: orcpt: NULL flags: 0
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
@@ -285,6 +289,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -313,6 +318,10 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |userx@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
@@ -325,6 +334,7 @@ changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@ -336,7 +346,9 @@ Non-recipients:
Empty Tree
---- End of tree ----
recipients_count=1
+**** SPOOL_IN - No additional fields
body_linecount=1 message_linecount=7
+DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@???
locking TESTSUITE/spool/db/retry.lockfile
@@ -438,6 +450,14 @@ userx@???: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
+DSN: processing router : r1
+DSN: processing successful delivery address: userx@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL flags: 0
+DSN: envid: NULL ret: 0
+DSN: Final recipient: userx@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/3000 b/test/stderr/3000
index 0b7c946..6859068 100644
--- a/test/stderr/3000
+++ b/test/stderr/3000
@@ -46,6 +46,7 @@ LOG: smtp_connection MAIN
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> x.y.z 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_rcpt"
>>> processing "accept"
diff --git a/test/stderr/3208 b/test/stderr/3208
index 9b33e5f..1eba140 100644
--- a/test/stderr/3208
+++ b/test/stderr/3208
@@ -7,6 +7,7 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> remote.host in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts? yes (matched "*")
>>> test.ex in percent_hack_domains? no (matched "!test.ex")
>>> using ACL "check_recipient"
diff --git a/test/stderr/3210 b/test/stderr/3210
index 7d6faab..75a4084 100644
--- a/test/stderr/3210
+++ b/test/stderr/3210
@@ -5,6 +5,7 @@ configuration file is TESTSUITE/test-config
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: r1 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@???
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git a/test/stderr/3400 b/test/stderr/3400
index 138f2be..6eda313 100644
--- a/test/stderr/3400
+++ b/test/stderr/3400
@@ -83,6 +83,7 @@ LOG: H=[10.0.0.2] Warning: accepted ETRN #abcd
>>> accept: condition test succeeded in ACL "check_connect"
>>> end of ACL "check_connect": ACCEPT
>>> test.host 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 "10.0.0.1"? yes (matched "10.0.0.1")
>>> host in auth_advertise_hosts? yes (matched "+auth_hosts")
@@ -283,6 +284,7 @@ LOG: H=(test.host) [10.0.0.1] Warning: accepted ETRN #abcd
>>> accept: condition test succeeded in ACL "check_connect"
>>> end of ACL "check_connect": ACCEPT
>>> test.host 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 "10.0.0.1"? no (end of list)
>>> host in "10.0.0.4"? no (end of list)
@@ -378,6 +380,7 @@ LOG: H=(test.host) [10.0.0.3] F=<junk@???> rejected RCPT <userx@cu
>>> accept: condition test succeeded in ACL "check_connect"
>>> end of ACL "check_connect": ACCEPT
>>> test.host 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 "10.0.0.1"? no (end of list)
>>> host in "10.0.0.4"? yes (matched "10.0.0.4")
@@ -392,6 +395,8 @@ trusted user
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: fail_remote_domains propagating DSN
+DSN: localuser propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -426,6 +431,7 @@ testing.testing in helo_lookup_domains? no (end of list)
sender_fullhost = (testing.testing) [10.0.0.5]
sender_rcvhost = [10.0.0.5] (helo=testing.testing ident=CALLER)
set_process_info: pppp handling incoming connection from (testing.testing) [10.0.0.5] U=CALLER
+host in dsn_advertise_hosts? no (option unset)
host in pipelining_advertise_hosts? yes (matched "*")
host in "10.0.0.1"? no (end of list)
host in "10.0.0.4"? no (end of list)
diff --git a/test/stderr/3408 b/test/stderr/3408
index 105c6ba..8c6fb8b 100644
--- a/test/stderr/3408
+++ b/test/stderr/3408
@@ -7,6 +7,7 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> exim.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 auth_advertise_hosts? yes (matched "*")
>>> using ACL "check_recipient"
@@ -51,6 +52,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@??? H=(exim.test.ex) [V4NET.11.12.1
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> exim.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 auth_advertise_hosts? yes (matched "*")
>>> plain authenticator server_condition:
diff --git a/test/stderr/3410 b/test/stderr/3410
index 618d18a..2a6c3d5 100644
--- a/test/stderr/3410
+++ b/test/stderr/3410
@@ -14,6 +14,7 @@
>>> accept: endpass encountered - denying access
LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
>>> rhu.barb 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 auth_advertise_hosts? yes (matched "*")
>>> auth1 authenticator server_condition:
@@ -46,6 +47,7 @@ LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
>>> end of ACL "acl_5_6_10": implicit DENY
LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
>>> rhu.barb 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 auth_advertise_hosts? yes (matched "*")
>>> auth1 authenticator server_condition:
@@ -71,6 +73,7 @@ LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> rhu.barb 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 auth_advertise_hosts? yes (matched "*")
>>> auth2 authenticator server_condition:
diff --git a/test/stderr/3500 b/test/stderr/3500
index 53c8508..61225ae 100644
--- a/test/stderr/3500
+++ b/test/stderr/3500
@@ -7,6 +7,7 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> test.host 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 "10.0.0.1 : 10.0.0.5"? no (end of list)
>>> host in "10.0.0.4"? yes (matched "10.0.0.4")
@@ -20,6 +21,7 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> test.host 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 "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.1")
>>> host in auth_advertise_hosts? yes (matched "+auth_hosts")
@@ -70,6 +72,7 @@ LOG: 10HmaY-0005vi-00 <= userx@??? H=(test.host) [10.0.0.1] P=esmtpa A=c
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> test.host 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 "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.5")
>>> host in auth_advertise_hosts? yes (matched "+auth_hosts")
diff --git a/test/stderr/5004 b/test/stderr/5004
index 4d6968f..f8d86b7 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -7,6 +7,7 @@ changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -35,6 +36,10 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz)
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |userx@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
@@ -49,6 +54,7 @@ trusted user
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@ -60,7 +66,9 @@ Non-recipients:
Empty Tree
---- End of tree ----
recipients_count=1
+**** SPOOL_IN - No additional fields
body_linecount=1 message_linecount=7
+DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@???
locking TESTSUITE/spool/db/retry.lockfile
@@ -166,6 +174,22 @@ userx@???: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
+DSN: processing router : r1
+DSN: processing successful delivery address: TESTSUITE/test-mail
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL flags: 0
+DSN: envid: NULL ret: 0
+DSN: Final recipient: TESTSUITE/test-mail
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: processing router : r1
+DSN: processing successful delivery address: userx@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL flags: 0
+DSN: envid: NULL ret: 0
+DSN: Final recipient: userx@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/5005 b/test/stderr/5005
index e61cc77..8a9536a 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -5,6 +5,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -33,6 +34,10 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |nofile@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
@@ -45,6 +50,7 @@ changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@ -56,7 +62,9 @@ Non-recipients:
Empty Tree
---- End of tree ----
recipients_count=1
+**** SPOOL_IN - No additional fields
body_linecount=1 message_linecount=7
+DSN: set orcpt: NULL flags: 0
Delivery address list:
nofile@???
locking TESTSUITE/spool/db/retry.lockfile
@@ -158,6 +166,14 @@ nofile@???: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
+DSN: processing router : r1
+DSN: processing successful delivery address: nofile@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL flags: 0
+DSN: envid: NULL ret: 0
+DSN: Final recipient: nofile@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
@@ -173,6 +189,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -201,6 +218,10 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |userx@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
@@ -212,6 +233,7 @@ changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@ -223,7 +245,9 @@ Non-recipients:
Empty Tree
---- End of tree ----
recipients_count=1
+**** SPOOL_IN - No additional fields
body_linecount=1 message_linecount=7
+DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@???
locking TESTSUITE/spool/db/retry.lockfile
@@ -326,6 +350,14 @@ userx@???: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
+DSN: processing router : r1
+DSN: processing successful delivery address: userx@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL flags: 0
+DSN: envid: NULL ret: 0
+DSN: Final recipient: userx@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
LOG: MAIN
Completed
end delivery of 10HmaY-0005vi-00
@@ -341,6 +373,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -369,6 +402,10 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |userx@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
@@ -380,6 +417,7 @@ changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@ -391,7 +429,9 @@ Non-recipients:
Empty Tree
---- End of tree ----
recipients_count=1
+**** SPOOL_IN - No additional fields
body_linecount=1 message_linecount=7
+DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@???
locking TESTSUITE/spool/db/retry.lockfile
@@ -506,6 +546,10 @@ dbfn_write: key=T:userx@???
end of retry processing
delivery deferred: update_spool=1 header_rewritten=0
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |userx@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
end delivery of 10HmaZ-0005vi-00
search_tidyup called
@@ -520,6 +564,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -548,6 +593,10 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |userx@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
@@ -559,6 +608,7 @@ changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@ -570,7 +620,9 @@ Non-recipients:
Empty Tree
---- End of tree ----
recipients_count=1
+**** SPOOL_IN - No additional fields
body_linecount=1 message_linecount=7
+DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@???
locking TESTSUITE/spool/db/retry.lockfile
@@ -678,6 +730,10 @@ dbfn_write: key=T:userx@???
end of retry processing
delivery deferred: update_spool=1 header_rewritten=0
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |userx@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
end delivery of 10HmbA-0005vi-00
search_tidyup called
diff --git a/test/stderr/5006 b/test/stderr/5006
index 1dd6dc9..72b650f 100644
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -5,6 +5,7 @@ configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -33,6 +34,10 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |userx@???| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
@@ -45,6 +50,7 @@ changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
+DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@ -56,7 +62,9 @@ Non-recipients:
Empty Tree
---- End of tree ----
recipients_count=1
+**** SPOOL_IN - No additional fields
body_linecount=1 message_linecount=7
+DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@???
locking TESTSUITE/spool/db/retry.lockfile
@@ -156,6 +164,14 @@ userx@???: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
+DSN: processing router : r1
+DSN: processing successful delivery address: userx@???
+DSN: Sender_address: CALLER@???
+DSN: orcpt: NULL flags: 0
+DSN: envid: NULL ret: 0
+DSN: Final recipient: userx@???
+DSN: Remote SMTP server supports DSN: 0
+DSN: *** NOT SENDING DSN SUCCESS Message ***
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/5204 b/test/stderr/5204
index 2c1a986..b6f8523 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)"@???
--------> 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)"@???
--------> 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)"@???
--------> b router <--------
@@ -62,6 +74,10 @@ q router: defer for "ERROR cannot route this one (ERROR)"@???
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)"@???
--------> b router <--------
@@ -81,6 +97,10 @@ q router: defer for "DEFER cannot route this one (DEFER)"@???
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"@???
--------> 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@???
--------> 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)"@???
--------> b router <--------
@@ -166,6 +194,10 @@ q router: defer for "FREEZE cannot route this one (FREEZE)"@???
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@???
--------> 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)"@???
+routing "FAIL cannot route this one=(FAIL)"@???
--------> 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)"@???: domain = some.host
+q router called for "FAIL cannot route this one=(FAIL)"@???: 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)"@???>: cannot route this one (FAIL)
+ H=(some.name) [V4NET.2.3.4] F=<x@y> rejected RCPT <"FAIL cannot route this one=(FAIL)"@???>: 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 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/5400 b/test/stderr/5400
index fc3b606..9fa77d5 100644
--- a/test/stderr/5400
+++ b/test/stderr/5400
@@ -152,6 +152,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
 not using PIPELINING
+use_dsn=0
   SMTP>> MAIL FROM:<CALLER@???>
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<usery@???>
diff --git a/test/stderr/5410 b/test/stderr/5410
index 09cc1f3..0f655c4 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -6,6 +6,7 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
    result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts? yes (matched "*")
  in tls_advertise_hosts? yes (matched "*")
 expanding: SERVER
@@ -168,6 +169,7 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
    result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts? yes (matched "*")
  in tls_advertise_hosts? yes (matched "*")
 expanding: SERVER
@@ -304,6 +306,7 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
    result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts? yes (matched "*")
  in tls_advertise_hosts? yes (matched "*")
 expanding: SERVER
diff --git a/test/stderr/5420 b/test/stderr/5420
index 449914d..7f93329 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -6,6 +6,7 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
    result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts? yes (matched "*")
  in tls_advertise_hosts? yes (matched "*")
 expanding: SERVER
@@ -167,6 +168,7 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
    result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts? yes (matched "*")
  in tls_advertise_hosts? yes (matched "*")
 expanding: SERVER
@@ -303,6 +305,7 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
    result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts? yes (matched "*")
  in tls_advertise_hosts? yes (matched "*")
 expanding: SERVER
diff --git a/test/stdout/0147 b/test/stdout/0147
index 34ba8bd..b877c61 100644
--- a/test/stdout/0147
+++ b/test/stdout/0147
@@ -25,6 +25,7 @@ debug_print =
 no_disable_logging
 domains = 
 driver = accept
+no_dsn_lasthop
 errors_to = 
 expn
 no_fail_verify_recipient
diff --git a/test/stdout/0338 b/test/stdout/0338
index a977513..52bd7ee 100644
--- a/test/stdout/0338
+++ b/test/stdout/0338
@@ -19,7 +19,7 @@ NY a2-userx@???
 NN userx@???
 2
 userx@???
-a1-userx@??? postmaster@??? 18,0#1
+a1-userx@???  0,0 postmaster@??? 18,0#3

 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
diff --git a/test/stdout/0442 b/test/stdout/0442
index 1c03269..b47d7b3 100644
--- a/test/stdout/0442
+++ b/test/stdout/0442
@@ -10,6 +10,7 @@ debug_print =
 no_disable_logging
 domains = 
 driver = accept
+no_dsn_lasthop
 errors_to = 
 expn
 no_fail_verify_recipient
diff --git a/test/stdout/3412 b/test/stdout/3412
index b7c7a37..613d6db 100644
--- a/test/stdout/3412
+++ b/test/stdout/3412
@@ -22,10 +22,15 @@ X-Failed-Recipients: x@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmaY-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
This message was created automatically by mail delivery software.

 A message that you sent could not be delivered to one or more of its
@@ -34,7 +39,17 @@ recipients. This is a permanent error. The following address(es) failed:
   x@???
     no deliveries made locally