DSN: add References: header. Bug 2452

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 293ff201a84689ae460a2504fe41a6efee5e44fe..cad1f5abb6f859870b79e0383a6faaba355a5ed2 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -185,6 +185,8 @@ HS/05 Handle trailing backslash gracefully. (CVE-2019-15846)
 
 JH/39 Promote DMARC support to mainline.
 
+JH/40 Bug 2452: Add a References: header to DSNs.
+
 
 Exim version 4.92
 -----------------

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 72751c2dc5d415404356df594df10f61fbddc1e6..7433b5fb2d9426874077ec2f8a80c7c61bb41896 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -7344,7 +7344,7 @@ if (addr_senddsn)
   if (pid < 0)  /* Creation of child failed */
     {
     log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Process %d (parent %d) failed to "
-      "create child process to send failure message: %s", getpid(),
+      "create child process to send success-dsn message: %s", getpid(),
       getppid(), strerror(errno));
 
     DEBUG(D_deliver) debug_printf("DSN: child_open_exim failed\n");
@@ -7357,7 +7357,7 @@ if (addr_senddsn)
     transport_ctx tctx = {{0}};
 
     DEBUG(D_deliver)
-      debug_printf("sending error message to: %s\n", sender_address);
+      debug_printf("sending success-dsn to: %s\n", sender_address);
 
     /* build unique id for MIME boundary */
     bound = string_sprintf(TIME_T_FMT "-eximdsn-%d", time(NULL), rand());
@@ -7369,8 +7369,11 @@ if (addr_senddsn)
     moan_write_from(f);
     fprintf(f, "Auto-Submitted: auto-generated\n"
        "To: %s\n"
-       "Subject: Delivery Status Notification\n"
-       "Content-Type: multipart/report; report-type=delivery-status; boundary=%s\n"
+       "Subject: Delivery Status Notification\n",
+      sender_address);
+    moan_write_references(f, NULL);
+    fprintf(f, "Content-Type: multipart/report;"
+               " report-type=delivery-status; boundary=%s\n"
        "MIME-Version: 1.0\n\n"
 
        "--%s\n"
@@ -7378,7 +7381,7 @@ if (addr_senddsn)
 
        "This message was created automatically by mail delivery software.\n"
        " ----- The following addresses had successful delivery notifications -----\n",
-      sender_address, bound, bound);
+      bound, bound);
 
     for (address_item * a = addr_senddsn; a; a = a->next)
       fprintf(f, "<%s> (relayed %s)\n\n",
@@ -7607,6 +7610,7 @@ while (addr_failed)
       fprintf(fp, "Auto-Submitted: auto-replied\n");
       moan_write_from(fp);
       fprintf(fp, "To: %s\n", bounce_recipient);
+      moan_write_references(fp, NULL);
 
       /* generate boundary string and output MIME-Headers */
       bound = string_sprintf(TIME_T_FMT "-eximdsn-%d", time(NULL), rand());
@@ -8192,7 +8196,8 @@ else if (addr_defer != (address_item *)(+1))
 
     DEBUG(D_deliver)
       {
-      debug_printf("time on queue = %s  id %s  addr %s\n", readconf_printtime(queue_time), message_id, addr_defer->address);
+      debug_printf("time on queue = %s  id %s  addr %s\n",
+       readconf_printtime(queue_time), message_id, addr_defer->address);
       debug_printf("warning counts: required %d done %d\n", count,
         warning_count);
       }
@@ -8230,6 +8235,7 @@ else if (addr_defer != (address_item *)(+1))
         fprintf(f, "Auto-Submitted: auto-replied\n");
         moan_write_from(f);
         fprintf(f, "To: %s\n", recipients);
+       moan_write_references(f, NULL);
 
         /* generated boundary string and output MIME-Headers */
         bound = string_sprintf(TIME_T_FMT "-eximdsn-%d", time(NULL), rand());

diff --git a/src/src/functions.h b/src/src/functions.h
index 31c0057736b4ab7e91fbd1dbb0637f78f0cf2041..d99f15465f07000bd8bf7a8c477c46c168ae75aa 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -335,6 +335,7 @@ extern void    moan_tell_someone(uschar *, address_item *,
                  const uschar *, const char *, ...) PRINTF_FUNCTION(4,5);
 extern BOOL    moan_to_sender(int, error_block *, header_line *, FILE *, BOOL);
 extern void    moan_write_from(FILE *);
+extern void    moan_write_references(FILE *, uschar *);
 extern FILE   *modefopen(const uschar *, const char *, mode_t);
 
 extern int     open_cutthrough_connection( address_item * addr );

diff --git a/src/src/moan.c b/src/src/moan.c
index f6cda37f2b709b9d8697d625ad20889bc6a3022f..31d033c1adcf66ed51c9ad65307212fea66804a5 100644 (file)
--- a/src/src/moan.c
+++ b/src/src/moan.c
@@ -28,7 +28,7 @@ Returns:    nothing
 void
 moan_write_from(FILE *f)
 {
-uschar *s = expand_string(dsn_from);
+uschar * s = expand_string(dsn_from);
 if (!s)
   {
   log_write(0, LOG_MAIN|LOG_PANIC,
@@ -40,6 +40,80 @@ fprintf(f, "From: %s\n", s);
 
 
 
+/*************************************************
+*            Write References: line for DSN      *
+*************************************************/
+
+/* Generate a References: header if there is in the header_list
+at least one of Message-ID:, References:, or In-Reply-To: (see RFC 2822).
+
+Arguments:  f          the FILE to write to
+           message_id  optional already-found message-id, or NULL
+
+Returns:    nothing
+*/
+
+void
+moan_write_references(FILE * fp, uschar * message_id)
+{
+header_line * h;
+
+if (!message_id)
+  for (h = header_list; h; h = h->next)
+    if (h->type == htype_id)
+      {
+      message_id = Ustrchr(h->text, ':') + 1;
+      while (isspace(*message_id)) message_id++;
+      }
+
+for (h = header_list; h; h = h->next)
+  if (h->type != htype_old && strncmpic(US"References:", h->text, 11) == 0)
+    break;
+
+if (!h)
+  for (h = header_list; h; h = h->next)
+    if (h->type != htype_old && strncmpic(US"In-Reply-To:", h->text, 12) == 0)
+      break;
+
+/* We limit the total length of references.  Although there is no fixed
+limit, some systems do not like headers growing beyond recognition.
+Keep the first message ID for the thread root and the last few for
+the position inside the thread, up to a maximum of 12 altogether. */
+
+if (h || message_id)
+  {
+  fprintf(fp, "References:");
+  if (h)
+    {
+    uschar * s, * id, * error;
+    uschar * referenced_ids[12];
+    int reference_count = 0;
+
+    s = Ustrchr(h->text, ':') + 1;
+    f.parse_allow_group = FALSE;
+    while (*s && (s = parse_message_id(s, &id, &error)))
+      if (reference_count == nelem(referenced_ids))
+        {
+        memmove(referenced_ids + 1, referenced_ids + 2,
+           sizeof(referenced_ids) - 2*sizeof(uschar *));
+        referenced_ids[reference_count - 1] = id;
+        }
+      else
+       referenced_ids[reference_count++] = id;
+
+    for (int i = 0; i < reference_count; ++i)
+      fprintf(fp, " %s", referenced_ids[i]);
+    }
+
+  /* The message id will have a newline on the end of it. */
+
+  if (message_id) fprintf(fp, " %s", message_id);
+  else fprintf(fp, "\n");
+  }
+}
+
+
+
 /*************************************************
 *              Send error message                *
 *************************************************/
@@ -119,6 +193,7 @@ else
   moan_write_from(fp);
 
 fprintf(fp, "To: %s\n", recipient);
+moan_write_references(fp, NULL);
 
 switch(ident)
   {
@@ -145,7 +220,7 @@ switch(ident)
       "A message that you sent contained one or more recipient addresses that were\n"
       "incorrectly constructed:\n\n");
 
-    while (eblock != NULL)
+    while (eblock)
       {
       fprintf(fp, "  %s: %s\n", eblock->text1, eblock->text2);
       count++;
@@ -522,6 +597,7 @@ f = fdopen(fd, "wb");
 fprintf(f, "Auto-Submitted: auto-replied\n");
 moan_write_from(f);
 fprintf(f, "To: %s\n", who);
+moan_write_references(f, NULL);
 fprintf(f, "Subject: %s\n\n", subject);
 va_start(ap, format);
 vfprintf(f, format, ap);
@@ -656,8 +732,7 @@ llen = domain++ - recipient;
 
 /* Scan through the configured items */
 
-while ((item = string_nextinlist(&listptr, &sep, buffer, sizeof(buffer)))
-       != NULL)
+while ((item = string_nextinlist(&listptr, &sep, buffer, sizeof(buffer))))
   {
   const uschar *newaddress = item;
   const uschar *pattern = string_dequote(&newaddress);
@@ -759,6 +834,7 @@ fprintf(f, "Auto-Submitted: auto-replied\n");
 moan_write_from(f);
 fprintf(f, "To: %s\n", s);
 fprintf(f, "Subject: error(s) in forwarding or filtering\n\n");
+moan_write_references(f, NULL);
 
 if (custom)
   {

diff --git a/src/src/transports/autoreply.c b/src/src/transports/autoreply.c
index 734e65833f6152eb0476b94413f1eb84c30a965c..1aef02aafd77e661455ed206c0f12d85ebca16a3 100644 (file)
--- a/src/src/transports/autoreply.c
+++ b/src/src/transports/autoreply.c
@@ -598,52 +598,7 @@ if (h)
   fprintf(fp, "In-Reply-To: %s", message_id);
   }
 
-/* Generate a References header if there is at least one of Message-ID:,
-References:, or In-Reply-To: (see RFC 2822). */
-
-for (h = header_list; h; h = h->next)
-  if (h->type != htype_old && strncmpic(US"References:", h->text, 11) == 0)
-    break;
-
-if (!h)
-  for (h = header_list; h; h = h->next)
-    if (h->type != htype_old && strncmpic(US"In-Reply-To:", h->text, 12) == 0)
-      break;
-
-/* We limit the total length of references.  Although there is no fixed
-limit, some systems do not like headers growing beyond recognition.
-Keep the first message ID for the thread root and the last few for
-the position inside the thread, up to a maximum of 12 altogether. */
-
-if (h || message_id)
-  {
-  fprintf(fp, "References:");
-  if (h)
-    {
-    uschar *s, *id, *error;
-    uschar *referenced_ids[12];
-    int reference_count = 0;
-
-    s = Ustrchr(h->text, ':') + 1;
-    f.parse_allow_group = FALSE;
-    while (*s != 0 && (s = parse_message_id(s, &id, &error)) != NULL)
-      {
-      if (reference_count == nelem(referenced_ids))
-        {
-        memmove(referenced_ids + 1, referenced_ids + 2,
-           sizeof(referenced_ids) - 2*sizeof(uschar *));
-        referenced_ids[reference_count - 1] = id;
-        }
-      else referenced_ids[reference_count++] = id;
-      }
-    for (int i = 0; i < reference_count; ++i) fprintf(fp, " %s", referenced_ids[i]);
-    }
-
-  /* The message id will have a newline on the end of it. */
-
-  if (message_id) fprintf(fp, " %s", message_id);
-  else fprintf(fp, "\n");
-  }
+moan_write_references(fp, message_id);
 
 /* Add an Auto-Submitted: header */
 

diff --git a/test/mail/0015.CALLER b/test/mail/0015.CALLER
index f251d97114b8f32e245b1808eb8bf118121d9eca..aa2e0d9ca4a5bd3717ea9bfda6c6c25f6ec3a96a 100644 (file)
--- a/test/mail/0015.CALLER
+++ b/test/mail/0015.CALLER
@@ -9,6 +9,7 @@ X-Failed-Recipients: page+userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -64,6 +65,7 @@ X-Failed-Recipients: page+userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0021.CALLER b/test/mail/0021.CALLER
index 8cdd7b30f7d99accd312ce348bf7db69369976ba..cac7613b3f32d11eb44a385fa9a0a76bb83aa451 100644 (file)
--- a/test/mail/0021.CALLER
+++ b/test/mail/0021.CALLER
@@ -5,6 +5,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Subject: Mail failure - no recipient addresses
 Message-Id: <E10HmbM-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/0021.ok b/test/mail/0021.ok
index e061f8670373e887faf6057783f57879bd874bc7..2691df465cc57ebfe84827d141cb4d1e8f6746e5 100644 (file)
--- a/test/mail/0021.ok
+++ b/test/mail/0021.ok
@@ -5,6 +5,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test2
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
 Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -33,6 +34,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test4
+References: <E10HmbA-0005vi-00@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
 Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/0021.userx b/test/mail/0021.userx
index a290342b09647356600391a9d0b56a807a3bdbae..ee2f5a849c339a24eb8f1ca77265d68d622a5f0f 100644 (file)
--- a/test/mail/0021.userx
+++ b/test/mail/0021.userx
@@ -5,6 +5,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
+References: <E10HmaY-0005vi-00@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -55,6 +56,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
+References: <E10HmbB-0005vi-00@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
 Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -71,6 +73,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
+References: <E10HmbC-0005vi-00@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
 Message-Id: <E10HmbK-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/0032.CALLER b/test/mail/0032.CALLER
index a3be6ebea32ed2365299055c2ae6cb8e4dec4b58..3551d575316a7b78c27b63ad275f858f56be7439 100644 (file)
--- a/test/mail/0032.CALLER
+++ b/test/mail/0032.CALLER
@@ -9,6 +9,7 @@ X-Failed-Recipients: userx@mxt1.test.ex
 Auto-Submitted: auto-replied
 From: MailProgram <xyz@some.where>
 To: CALLER@myhost.ex
+References: <E10HmaX-0005vi-00@myhost.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0037.CALLER b/test/mail/0037.CALLER
index 1985986ea8e46040b6ae7d1a492b1f8feb3347f7..5f667d13b8b9af96af1d38100a49a64edbd8b461 100644 (file)
--- a/test/mail/0037.CALLER
+++ b/test/mail/0037.CALLER
@@ -11,6 +11,7 @@ X-Failed-Recipients: usery@test.ex,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaY-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -95,6 +96,7 @@ X-Failed-Recipients: filter-pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbE-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -149,6 +151,7 @@ X-Failed-Recipients: filter-file@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbG-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -203,6 +206,7 @@ X-Failed-Recipients: filter-lookup@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbI-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -257,6 +261,7 @@ X-Failed-Recipients: filter-exists@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbK-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -311,6 +316,7 @@ X-Failed-Recipients: filter-readfile@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbM-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -365,6 +371,7 @@ X-Failed-Recipients: filter-run@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbO-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -437,6 +444,7 @@ X-Failed-Recipients: readfile@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbU-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -491,6 +499,7 @@ X-Failed-Recipients: filter-stat@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmcA-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0037.postmaster b/test/mail/0037.postmaster
index f7c2aea5095d59544037ed4d938dbe786cbfb51f..56f7a51cddfbac53ca3a2b0708b68164946af7e7 100644 (file)
--- a/test/mail/0037.postmaster
+++ b/test/mail/0037.postmaster
@@ -8,6 +8,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Subject: Message frozen
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -31,6 +32,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
+References: <E10HmbS-0005vi-00@the.local.host.name>
 Subject: Message frozen
 Message-Id: <E10HmbT-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/0048.CALLER b/test/mail/0048.CALLER
index fc1201e1079e8f960f2820326a56081b8b40dfff..f457b840802e91dc09c39188281b58675ad2f774 100644 (file)
--- a/test/mail/0048.CALLER
+++ b/test/mail/0048.CALLER
@@ -9,6 +9,7 @@ X-Failed-Recipients: pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -106,6 +107,7 @@ X-Failed-Recipients: prefixed+pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -203,6 +205,7 @@ X-Failed-Recipients: pipe-suffixed@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbB-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -300,6 +303,7 @@ X-Failed-Recipients: prefixed+pipe-suffixed@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbD-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -397,6 +401,7 @@ X-Failed-Recipients: pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbF-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0051.CALLER b/test/mail/0051.CALLER
index c3f9035e85daf0f71302345234bdf433e143d3b6..d7931d7c2dc01d70e5503a2c0b65cefa4ccbaf9b 100644 (file)
--- a/test/mail/0051.CALLER
+++ b/test/mail/0051.CALLER
@@ -9,6 +9,7 @@ X-Failed-Recipients: userx@bad.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
+References: <E10HmaY-0005vi-00@myhost.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -62,6 +63,7 @@ X-Failed-Recipients: userx@badbad.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
+References: <E10HmbA-0005vi-00@myhost.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -115,6 +117,7 @@ X-Failed-Recipients: userx@domain4.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
+References: <E10HmbD-0005vi-00@myhost.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -168,6 +171,7 @@ X-Failed-Recipients: userx@domain2.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
+References: <E10HmbF-0005vi-00@myhost.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0052.CALLER b/test/mail/0052.CALLER
index 8022ff0b6db5549b7c7cff3d0f6cc58658d4b10c..3a2ee9350eda8908c488d21a1d51cbee21b98d93 100644 (file)
--- a/test/mail/0052.CALLER
+++ b/test/mail/0052.CALLER
@@ -9,6 +9,7 @@ X-Failed-Recipients: xx99@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
+References: <E10HmaX-0005vi-00@myhost.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -62,6 +63,7 @@ X-Failed-Recipients: !two@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
+References: <E10HmbB-0005vi-00@myhost.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0098.CALLER b/test/mail/0098.CALLER
index 2f83f91163f167289e98d5dcc6e9e86a6d1ba27a..1804b418d76ad9dfcb1eecf0b5af6252d1ed39bd 100644 (file)
--- a/test/mail/0098.CALLER
+++ b/test/mail/0098.CALLER
@@ -8,6 +8,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 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
@@ -73,6 +74,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 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
@@ -138,6 +140,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 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
@@ -203,6 +206,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 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
@@ -263,6 +267,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 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
@@ -323,6 +328,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbB-0005vi-00@the.local.host.name>
 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
@@ -377,6 +383,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbD-0005vi-00@the.local.host.name>
 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
@@ -431,6 +438,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbM-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Warning: message 10HmbM-0005vi-00 delayed 0 minutes

diff --git a/test/mail/0103.CALLER b/test/mail/0103.CALLER
index 5461909ffe011a27927d17c70d0acb351a87225f..afa48bfa31c13e60df7fb9c5a6e444260652854e 100644 (file)
--- a/test/mail/0103.CALLER
+++ b/test/mail/0103.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: WASabc@x.y.zWAS
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaY-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -57,6 +58,7 @@ X-Failed-Recipients: ":fail: fail message"@special
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbC-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0136.forwarder b/test/mail/0136.forwarder
index 511ecab32fc3da36287dc6cbd1057868e6ce40e1..16e7a1891c3eae0491a46e5b68b75c47b8f95325 100644 (file)
--- a/test/mail/0136.forwarder
+++ b/test/mail/0136.forwarder
@@ -6,6 +6,7 @@ X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: forwarder@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed
@@ -60,6 +61,7 @@ X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: forwarder@test.ex
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed

diff --git a/test/mail/0140.CALLER b/test/mail/0140.CALLER
index 495410dae58dfa02013b0ef69e1e7f27e0d7ec08..7a53cce8b6416df1a8b19b25a5a6691d0e1293bf 100644 (file)
--- a/test/mail/0140.CALLER
+++ b/test/mail/0140.CALLER
@@ -27,6 +27,7 @@ X-Failed-Recipients: reply2@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0142.CALLER b/test/mail/0142.CALLER
index 73c8236014ca7febb7d858dd2753decc96ca7829..f7938eb8349d7a13ff2edf7c65787587fdd964b7 100644 (file)
--- a/test/mail/0142.CALLER
+++ b/test/mail/0142.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0164.CALLER b/test/mail/0164.CALLER
index dbc44d5106a4d3389329d594cee126f5e794c07e..256103573c021fa88742c143a22b41a48ef928ab 100644 (file)
--- a/test/mail/0164.CALLER
+++ b/test/mail/0164.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -99,6 +100,7 @@ X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0165.CALLER b/test/mail/0165.CALLER
index 30f63c990ab0d50b6afa3415a033a2cbcb2538ca..13bf30b339ec3d6406af2f9d5fa81f9e06e80667 100644 (file)
--- a/test/mail/0165.CALLER
+++ b/test/mail/0165.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -99,6 +100,7 @@ X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0174.CALLER b/test/mail/0174.CALLER
index f3cc605f89c762fa838e6d0be85a7db90a504b1d..8df061489d558cccd42658829205f4b96aec0e6e 100644 (file)
--- a/test/mail/0174.CALLER
+++ b/test/mail/0174.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: userx@non-local.example
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbB-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0176.CALLER b/test/mail/0176.CALLER
index 7446098ff69a35717aedc33199eed71930dc1dde..1cc0d544ddee44aa7b8991e7d497139ce4bb758a 100644 (file)
--- a/test/mail/0176.CALLER
+++ b/test/mail/0176.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: someone@somewhere
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0177.CALLER b/test/mail/0177.CALLER
index 013adc142c20134756c29e2814db7a06823f2a6d..30bddcaa73424ed7bde87ea7e051c7cef3668a43 100644 (file)
--- a/test/mail/0177.CALLER
+++ b/test/mail/0177.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0194.CALLER b/test/mail/0194.CALLER
index 41420fb84e0e9be8c5f8a06d5d560425b00b52ea..79944e6cbd087d366310d0f0f463f90d558d394d 100644 (file)
--- a/test/mail/0194.CALLER
+++ b/test/mail/0194.CALLER
@@ -8,6 +8,7 @@ X-Failed-Recipients: userz@myhost.test.ex,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -80,6 +81,7 @@ X-Failed-Recipients: seven@myhost.test.ex,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -178,6 +180,7 @@ X-Failed-Recipients: userz@myhost.test.ex,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmbC-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index 12511cd7338ed03ccfa7387b3ec15322c6c1c1bb..1501b9140bbbee9046e73b395e92f3d6a564eaad 100644 (file)
--- a/test/mail/0211.CALLER
+++ b/test/mail/0211.CALLER
@@ -7,6 +7,7 @@ X-Failed-Recipients: userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -63,6 +64,7 @@ X-Failed-Recipients: usery@domain2,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0224.CALLER b/test/mail/0224.CALLER
index 090003e8e8f1e0aa7a1f8852f2ae530f8b0375a3..ee6af38b3711c843d403564f9f06a1ab2c021b0b 100644 (file)
--- a/test/mail/0224.CALLER
+++ b/test/mail/0224.CALLER
@@ -9,6 +9,7 @@ X-Failed-Recipients: bounce@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -67,6 +68,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 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

diff --git a/test/mail/0226.CALLER b/test/mail/0226.CALLER
index 0b5653691eded9c0f6c91f15144da8591f77a272..900785beef0a5140ccd5e67e14e2785a162f8ae0 100644 (file)
--- a/test/mail/0226.CALLER
+++ b/test/mail/0226.CALLER
@@ -7,6 +7,7 @@ X-Failed-Recipients: |/p/q/r@no.test.ex,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -62,6 +63,7 @@ X-Failed-Recipients: |TESTSUITE/aux-fixed/showenv@yes.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0233.me b/test/mail/0233.me
index 1e9b1086cbf7983ff901806d67ef4cc826adebb4..2efa3588ca6f9ad1c2b084e987e11a105e9f0e07 100644 (file)
--- a/test/mail/0233.me
+++ b/test/mail/0233.me
@@ -5,6 +5,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: me@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Subject: Message frozen
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -23,6 +24,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: me@myhost.test.ex
+References: <E10HmbB-0005vi-00@myhost.test.ex>
 Subject: Message frozen on arrival
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -37,6 +39,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: me@myhost.test.ex
+References: <E10HmbD-0005vi-00@myhost.test.ex>
 Subject: Message frozen on arrival
 Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/0237.CALLER b/test/mail/0237.CALLER
index 9bd9e578cf271c4a882765ef8373b45536bc4f3b..4a1412c365785f88542b3d7040047c220c048837 100644 (file)
--- a/test/mail/0237.CALLER
+++ b/test/mail/0237.CALLER
@@ -5,6 +5,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -59,6 +60,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0253.lmn b/test/mail/0253.lmn
index ea91b0187173e5fc04aa81bb40874b7a5d8bb538..09ce0e9ba016cacf26b1193d833c45eb2d32dbae 100644 (file)
--- a/test/mail/0253.lmn
+++ b/test/mail/0253.lmn
@@ -6,6 +6,7 @@ X-Failed-Recipients: fail@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: lmn@myhost.test.ex
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed

diff --git a/test/mail/0256.CALLER b/test/mail/0256.CALLER
index 7292e9c1991c419b234625c6e8dc495993757d4c..0cf46b1d9a27b59f7746fca90faa618e2dca8662 100644 (file)
--- a/test/mail/0256.CALLER
+++ b/test/mail/0256.CALLER
@@ -5,6 +5,7 @@ X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0256.abc@def b/test/mail/0256.abc@def
index 6945aea731ac2674fe319b9812f0ea10b984cc2e..996f8d0df7cb8f423f518113c89cc139470d8e0b 100644 (file)
--- a/test/mail/0256.abc@def
+++ b/test/mail/0256.abc@def
@@ -5,6 +5,7 @@ X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: "abc@def"@unknown.domain
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0256.abcd+test.ex+xxxx b/test/mail/0256.abcd+test.ex+xxxx
index 7292e9c1991c419b234625c6e8dc495993757d4c..0cf46b1d9a27b59f7746fca90faa618e2dca8662 100644 (file)
--- a/test/mail/0256.abcd+test.ex+xxxx
+++ b/test/mail/0256.abcd+test.ex+xxxx
@@ -5,6 +5,7 @@ X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0256.abcd+unknown.domain+"abc@def" b/test/mail/0256.abcd+unknown.domain+"abc@def"
index 6945aea731ac2674fe319b9812f0ea10b984cc2e..996f8d0df7cb8f423f518113c89cc139470d8e0b 100644 (file)
--- a/test/mail/0256.abcd+unknown.domain+"abc@def"
+++ b/test/mail/0256.abcd+unknown.domain+"abc@def"
@@ -5,6 +5,7 @@ X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: "abc@def"@unknown.domain
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0266.CALLER b/test/mail/0266.CALLER
index d6c32667d7880a31f348c864c9b1170787b7de4d..144bf0131213eb343031148436cbc0bfb0018556 100644 (file)
--- a/test/mail/0266.CALLER
+++ b/test/mail/0266.CALLER
@@ -8,6 +8,7 @@ X-Failed-Recipients: nmlist@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbD-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0266.postmaster b/test/mail/0266.postmaster
index 7a17cf16e14333f95950a4df5869724efbcc128c..9abd0cc6b7282f0e4fd872eee5d73a059cfd7c07 100644 (file)
--- a/test/mail/0266.postmaster
+++ b/test/mail/0266.postmaster
@@ -11,6 +11,7 @@ Subject: error(s) in forwarding or filtering
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 The r1 router encountered the following error(s):
 
   domain missing or malformed in the address
@@ -31,6 +32,7 @@ Subject: error(s) in forwarding or filtering
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 The r1 router encountered the following error(s):
 
   domain missing or malformed in the address
@@ -51,6 +53,7 @@ Subject: error(s) in forwarding or filtering
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmbB-0005vi-00@myhost.test.ex>
 There's an error in your filter file.
 The file has been ignored.
 
@@ -73,6 +76,7 @@ Subject: error(s) in forwarding or filtering
 Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmbD-0005vi-00@myhost.test.ex>
 The r1a router encountered the following error(s):
 
   domain missing or malformed in the address
@@ -93,6 +97,7 @@ Subject: error(s) in forwarding or filtering
 Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmbG-0005vi-00@myhost.test.ex>
 There's an error in your filter file.
 The file has been ignored.
 
@@ -115,6 +120,7 @@ Subject: error(s) in forwarding or filtering
 Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmbI-0005vi-00@myhost.test.ex>
 There's an error in your filter file.
 The file has been ignored.
 

diff --git a/test/mail/0270.CALLER b/test/mail/0270.CALLER
index d6c32667d7880a31f348c864c9b1170787b7de4d..144bf0131213eb343031148436cbc0bfb0018556 100644 (file)
--- a/test/mail/0270.CALLER
+++ b/test/mail/0270.CALLER
@@ -8,6 +8,7 @@ X-Failed-Recipients: nmlist@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbD-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0270.postmaster b/test/mail/0270.postmaster
index 3a6d439230e8bb72437da5a665250ed87288c46b..18ad82c96728a9a427b3d71e55e2befb814edeb0 100644 (file)
--- a/test/mail/0270.postmaster
+++ b/test/mail/0270.postmaster
@@ -11,6 +11,7 @@ Subject: error(s) in forwarding or filtering
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 The r1 router encountered the following error(s):
 
   domain missing or malformed in the address
@@ -31,6 +32,7 @@ Subject: error(s) in forwarding or filtering
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 The r1 router encountered the following error(s):
 
   domain missing or malformed in the address
@@ -51,6 +53,7 @@ Subject: error(s) in forwarding or filtering
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmbB-0005vi-00@myhost.test.ex>
 There's an error in your filter file.
 The file has been ignored.
 
@@ -73,6 +76,7 @@ Subject: error(s) in forwarding or filtering
 Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmbD-0005vi-00@myhost.test.ex>
 The r1a router encountered the following error(s):
 
   domain missing or malformed in the address
@@ -93,6 +97,7 @@ Subject: error(s) in forwarding or filtering
 Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmbG-0005vi-00@myhost.test.ex>
 There's an error in your filter file.
 The file has been ignored.
 
@@ -115,6 +120,7 @@ Subject: error(s) in forwarding or filtering
 Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmbI-0005vi-00@myhost.test.ex>
 There's an error in your filter file.
 The file has been ignored.
 

diff --git a/test/mail/0280.CALLER b/test/mail/0280.CALLER
index 4de58ff3fdb49bc3e0f6106cbd33d22bd5d12055..1029f14de7460e60ed79f86f06e527d766d0ed9b 100644 (file)
--- a/test/mail/0280.CALLER
+++ b/test/mail/0280.CALLER
@@ -5,6 +5,7 @@ X-Failed-Recipients: spqr@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: spqr@test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -53,6 +54,7 @@ X-Failed-Recipients: abcd@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: abcd@test.ex
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0283.CALLER b/test/mail/0283.CALLER
index cd98cab62a3de40a49fb5bd65ddb3a2cb653c972..4169dc503a7e478dab2fbb8cde133eae2cf2b4ad 100644 (file)
--- a/test/mail/0283.CALLER
+++ b/test/mail/0283.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: somebody@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaY-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0296.CALLER b/test/mail/0296.CALLER
index c80c35ca821ee4663fe77c98384dfd873b858d1e..7451024be127aaab7e9ea68edc98be8a99167460 100644 (file)
--- a/test/mail/0296.CALLER
+++ b/test/mail/0296.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: failure@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0298.CALLER b/test/mail/0298.CALLER
index 0f513452848a67c0b00f3c0cc6e6a5c7695b46c2..b3ee1e863db1c2d793c5ff13f9d2f9b17f4adc91 100644 (file)
--- a/test/mail/0298.CALLER
+++ b/test/mail/0298.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: failure1@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -56,6 +57,7 @@ X-Failed-Recipients: failure2@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0306.anyone b/test/mail/0306.anyone
index f0df05d1f5e5f9723411da98933c65177c7466c4..01aae7fcd9143e9f3e6cef7dfb2be49fd4c0496c 100644 (file)
--- a/test/mail/0306.anyone
+++ b/test/mail/0306.anyone
@@ -6,6 +6,7 @@ X-Failed-Recipients: list1@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -55,6 +56,7 @@ X-Failed-Recipients: nonlist@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
+References: <E10HmbB-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0307.anyone b/test/mail/0307.anyone
index f0df05d1f5e5f9723411da98933c65177c7466c4..01aae7fcd9143e9f3e6cef7dfb2be49fd4c0496c 100644 (file)
--- a/test/mail/0307.anyone
+++ b/test/mail/0307.anyone
@@ -6,6 +6,7 @@ X-Failed-Recipients: list1@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -55,6 +56,7 @@ X-Failed-Recipients: nonlist@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
+References: <E10HmbB-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0309.CALLER b/test/mail/0309.CALLER
index b53186d4fe12f5b5707cb9dba738b753125c308e..42a6041125087814be321e9365dbe536a2cdf1f5 100644 (file)
--- a/test/mail/0309.CALLER
+++ b/test/mail/0309.CALLER
@@ -8,6 +8,7 @@ X-Failed-Recipients: 1k@myhost.test.ex,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0310.CALLER b/test/mail/0310.CALLER
index 1a4ca2e5c1e60affb3051f9b990a0ad49d367ebc..2be400b76c2042d982a4ddf36731569f5c0c93bc 100644 (file)
--- a/test/mail/0310.CALLER
+++ b/test/mail/0310.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: abcd@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0321.CALLER b/test/mail/0321.CALLER
index 1715e6169a0d22a62506bff3ce27dcb14515b377..891b20b3db54dc7fa0520c4c7abfb69605797763 100644 (file)
--- a/test/mail/0321.CALLER
+++ b/test/mail/0321.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: |/bin/cat\ /etc/aliases\ @test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0374.CALLER b/test/mail/0374.CALLER
index e92bef1f151f708ab7cb92e77c8e25aaf33cd091..15131c92b9d73833ee0913b27f706ccaead058f5 100644 (file)
--- a/test/mail/0374.CALLER
+++ b/test/mail/0374.CALLER
@@ -9,6 +9,7 @@ X-Failed-Recipients: d3@myhost.test.ex,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0375.CALLER b/test/mail/0375.CALLER
index 569d3f8bf7826b354597505dae847dd759e0675e..9dc76c961aeed537a40e9fdca12de46cbad44663 100644 (file)
--- a/test/mail/0375.CALLER
+++ b/test/mail/0375.CALLER
@@ -8,6 +8,7 @@ X-Failed-Recipients: e1@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0383.CALLER b/test/mail/0383.CALLER
index 5fa158a16c29b4bf6afb0366cd35373b0e5174de..817741767d4729daf03635b0215dbafa155bed6a 100644 (file)
--- a/test/mail/0383.CALLER
+++ b/test/mail/0383.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -102,6 +103,7 @@ X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -197,6 +199,7 @@ X-Failed-Recipients: redking@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbB-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0385.CALLER b/test/mail/0385.CALLER
index 721b15fcc95f3e04cee979e7daf171c6e5e98041..8f4f15a5495f5ef2359195c2289df0fead8d52e4 100644 (file)
--- a/test/mail/0385.CALLER
+++ b/test/mail/0385.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -57,6 +58,7 @@ X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -111,6 +113,7 @@ X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbB-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -193,6 +196,7 @@ X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbD-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0428.CALLER b/test/mail/0428.CALLER
index 8feca08bc72e423bbbcd56bbe8194c8ee8ef706e..dad1f7448a7d04e18879fccba141b96ed583ec6b 100644 (file)
--- a/test/mail/0428.CALLER
+++ b/test/mail/0428.CALLER
@@ -9,6 +9,7 @@ X-Failed-Recipients: restrict-userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbB-0005vi-00@mail.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -63,6 +64,7 @@ X-Failed-Recipients: restrict-userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbD-0005vi-00@mail.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0452.CALLER b/test/mail/0452.CALLER
index bda53558eb01a82d44a22fc5cd9b30cedc1e0e99..a0aac71f92763a8fdbe3b22aab7ca23e4a915c0c 100644 (file)
--- a/test/mail/0452.CALLER
+++ b/test/mail/0452.CALLER
@@ -25,6 +25,7 @@ X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0461.CALLER b/test/mail/0461.CALLER
index 7321dd6db3a0c6fdedcf5dec2cf3d1c90a0cb6d5..0f19a62b1a6c9ff59446fdde90354269fb72af26 100644 (file)
--- a/test/mail/0461.CALLER
+++ b/test/mail/0461.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbA-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -56,6 +57,7 @@ X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbC-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -106,6 +108,7 @@ X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbE-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0508.postmaster b/test/mail/0508.postmaster
index bd36b3d63a3543ba93c271dca63adb248e9003a7..8a069ca1339f4a69e1ee62eb90c1b53914d58838 100644 (file)
--- a/test/mail/0508.postmaster
+++ b/test/mail/0508.postmaster
@@ -6,6 +6,7 @@ X-Failed-Recipients: userx@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: postmaster@test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed

diff --git a/test/mail/0522.CALLER b/test/mail/0522.CALLER
index d718ca949c02d91e2ab35ffa7e86f2bdf1aa210c..867dea8971dae5c2eb00072f671a87f8181bd764 100644 (file)
--- a/test/mail/0522.CALLER
+++ b/test/mail/0522.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: nofilter@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -55,6 +56,7 @@ X-Failed-Recipients: filter@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0531.CALLER b/test/mail/0531.CALLER
index b31f69571be956d750e409088261585c6dd87b0e..fb54ab68f2c75b379bccd2b680a375f2eba52310 100644 (file)
--- a/test/mail/0531.CALLER
+++ b/test/mail/0531.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -58,6 +59,7 @@ X-Failed-Recipients: userx@retry.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -111,6 +113,7 @@ X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmbB-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0536.oksender b/test/mail/0536.oksender
index 9c4b472cdbafe6dfde6073feb990e2cc5929b310..8a6490899e7d7cd2ff8af90c7b88e897ef21bfba 100644 (file)
--- a/test/mail/0536.oksender
+++ b/test/mail/0536.oksender
@@ -6,6 +6,7 @@ X-Failed-Recipients: user22@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: oksender@test.ex
+References: <E10HmbB-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0536.user1 b/test/mail/0536.user1
index b918842f98735584c52bf97a115db3e8a9a5e0b4..7be8501d91faf42ce05b0960493ef845da59728c 100644 (file)
--- a/test/mail/0536.user1
+++ b/test/mail/0536.user1
@@ -5,6 +5,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: user1@test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/0536.user2 b/test/mail/0536.user2
index 64bd15814d1664c89f208a943c44753331bf40ed..33eb92a5b635ee5ddf3f5d3df08ae2e9926c531f 100644 (file)
--- a/test/mail/0536.user2
+++ b/test/mail/0536.user2
@@ -5,6 +5,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: user2@test.ex
+References: <E10HmaY-0005vi-00@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/0573.limited b/test/mail/0573.limited
index 25ddebc36b1c1cac5ffc6bacd5697b77f03d33a4..6c6cf51124ac1ee413cad75a5c19fb13ce90c10b 100644 (file)
--- a/test/mail/0573.limited
+++ b/test/mail/0573.limited
@@ -6,6 +6,7 @@ X-Failed-Recipients: fred@undeliverable.org
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: limited@myhost.test.ex
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/0573.not_limited b/test/mail/0573.not_limited
index 62f89f072ea8b7472b1e2ddd0e83ace50a6f01c4..e0f150907afee0546fb551083ffdf897afd08ad2 100644 (file)
--- a/test/mail/0573.not_limited
+++ b/test/mail/0573.not_limited
@@ -6,6 +6,7 @@ X-Failed-Recipients: fred@undeliverable.org
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: not_limited@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/4203.यहलोगहिन्दीक्योंनहींबोलसकतेहैं b/test/mail/4203.यहलोगहिन्दीक्योंनहींबोलसकतेहैं
index 35c0ea79fbe02f0e514205c327567525d996cbb9..b93a5b26fa6df1ae06093ce548b71ac5b9a64957 100644 (file)
--- a/test/mail/4203.यहलोगहिन्दीक्योंनहींबोलसकतेहैं
+++ b/test/mail/4203.यहलोगहिन्दीक्योंनहींबोलसकतेहैं
@@ -9,6 +9,7 @@ X-Failed-Recipients: userz@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@the.local.host.name>
 To: यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/4213.यहलोगहिन्दीक्योंनहींबोलसकतेहैं b/test/mail/4213.यहलोगहिन्दीक्योंनहींबोलसकतेहैं
index 35c0ea79fbe02f0e514205c327567525d996cbb9..b93a5b26fa6df1ae06093ce548b71ac5b9a64957 100644 (file)
--- a/test/mail/4213.यहलोगहिन्दीक्योंनहींबोलसकतेहैं
+++ b/test/mail/4213.यहलोगहिन्दीक्योंनहींबोलसकतेहैं
@@ -9,6 +9,7 @@ X-Failed-Recipients: userz@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@the.local.host.name>
 To: यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/4223.यहलोगहिन्दीक्योंनहींबोलसकतेहैं b/test/mail/4223.यहलोगहिन्दीक्योंनहींबोलसकतेहैं
index 35c0ea79fbe02f0e514205c327567525d996cbb9..b93a5b26fa6df1ae06093ce548b71ac5b9a64957 100644 (file)
--- a/test/mail/4223.यहलोगहिन्दीक्योंनहींबोलसकतेहैं
+++ b/test/mail/4223.यहलोगहिन्दीक्योंनहींबोलसकतेहैं
@@ -9,6 +9,7 @@ X-Failed-Recipients: userz@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@the.local.host.name>
 To: यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/4550.store b/test/mail/4550.store
index bb8afeb2a1ff44c1cd775aff8e9fd9bfd31308d5..74d13383e2e542514a59f85546ad972aad086f56 100644 (file)
--- a/test/mail/4550.store
+++ b/test/mail/4550.store
@@ -11,6 +11,7 @@ X-Failed-Recipients: baduser@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/4700.CALLER b/test/mail/4700.CALLER
index bde98db7d755278023d6676fc3eb0de1b779cab3..dd396d93d81a8a4e6fde00684e0323a67b6a4ffa 100644 (file)
--- a/test/mail/4700.CALLER
+++ b/test/mail/4700.CALLER
@@ -7,6 +7,7 @@ X-Failed-Recipients: userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -66,6 +67,7 @@ X-Failed-Recipients: usery@domain2,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/5101.copied b/test/mail/5101.copied
index 253eb2c4723c4a59818ca1cde97501c1f9169938..85470f9b99bb16c4a5b421fb7d70b54281afe849 100644 (file)
--- a/test/mail/5101.copied
+++ b/test/mail/5101.copied
@@ -22,6 +22,7 @@ X-Failed-Recipients: jack@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -75,6 +76,7 @@ X-Failed-Recipients: jack@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/mail/5200.postmaster b/test/mail/5200.postmaster
index 0068db5da1bc319bf0b68dbfa5d0182bc802351f..b278ac42f2f5adbb30a52fcb43dccd0819d0a55d 100644 (file)
--- a/test/mail/5200.postmaster
+++ b/test/mail/5200.postmaster
@@ -8,6 +8,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Subject: Message frozen
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/5204.CALLER b/test/mail/5204.CALLER
index d7c62f07de185dc1639aab5c08fb37aba3c01aff..dce7a835030c6613fccff2e158920b5aeffc5fba 100644 (file)
--- a/test/mail/5204.CALLER
+++ b/test/mail/5204.CALLER
@@ -6,6 +6,7 @@ X-Failed-Recipients: "FAIL cannot route this one (FAIL)"@some.host
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender

diff --git a/test/stderr/0388 b/test/stderr/0388
index e11ca71b3c0f5177026f7dcfbe78e0722d7e0069..4d0629788851a0aa21bb4c7a4453791894b8d98b 100644 (file)
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -190,6 +190,7 @@ X-Failed-Recipients: x@y
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -204,6 +205,7 @@ search_tidyup called
   Auto-Submitted: auto-replied
 F From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 T To: CALLER@myhost.test.ex
+  References: <E10HmaX-0005vi-00@myhost.test.ex>
   Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
   MIME-Version: 1.0
   Subject: Mail delivery failed: returning message to sender

diff --git a/test/stdout/3412 b/test/stdout/3412
index 613d6dbb14af2348e86cd180c6ad71cdb5873af3..80a4e1b38601637e9354f6aaa84721d207da7e02 100644 (file)
--- a/test/stdout/3412
+++ b/test/stdout/3412
@@ -22,6 +22,7 @@ X-Failed-Recipients: x@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender