From d6c829b9a350f61c98196768e3260beb3cbecbfe Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Wed, 2 Oct 2019 14:49:55 +0100 Subject: [PATCH] DSN: add References: header. Bug 2452 --- doc/doc-txt/ChangeLog | 2 + src/src/deliver.c | 18 ++-- src/src/functions.h | 1 + src/src/moan.c | 84 ++++++++++++++++++- src/src/transports/autoreply.c | 47 +---------- test/mail/0015.CALLER | 2 + test/mail/0021.CALLER | 1 + test/mail/0021.ok | 2 + test/mail/0021.userx | 3 + test/mail/0032.CALLER | 1 + test/mail/0037.CALLER | 9 ++ test/mail/0037.postmaster | 2 + test/mail/0048.CALLER | 5 ++ test/mail/0051.CALLER | 4 + test/mail/0052.CALLER | 2 + test/mail/0098.CALLER | 8 ++ test/mail/0103.CALLER | 2 + test/mail/0136.forwarder | 2 + test/mail/0140.CALLER | 1 + test/mail/0142.CALLER | 1 + test/mail/0164.CALLER | 2 + test/mail/0165.CALLER | 2 + test/mail/0174.CALLER | 1 + test/mail/0176.CALLER | 1 + test/mail/0177.CALLER | 1 + test/mail/0194.CALLER | 3 + test/mail/0211.CALLER | 2 + test/mail/0224.CALLER | 2 + test/mail/0226.CALLER | 2 + test/mail/0233.me | 3 + test/mail/0237.CALLER | 2 + test/mail/0253.lmn | 1 + test/mail/0256.CALLER | 1 + test/mail/0256.abc@def | 1 + test/mail/0256.abcd+test.ex+xxxx | 1 + .../0256.abcd+unknown.domain+\"abc@def\"" | 1 + test/mail/0266.CALLER | 1 + test/mail/0266.postmaster | 6 ++ test/mail/0270.CALLER | 1 + test/mail/0270.postmaster | 6 ++ test/mail/0280.CALLER | 2 + test/mail/0283.CALLER | 1 + test/mail/0296.CALLER | 1 + test/mail/0298.CALLER | 2 + test/mail/0306.anyone | 2 + test/mail/0307.anyone | 2 + test/mail/0309.CALLER | 1 + test/mail/0310.CALLER | 1 + test/mail/0321.CALLER | 1 + test/mail/0374.CALLER | 1 + test/mail/0375.CALLER | 1 + test/mail/0383.CALLER | 3 + test/mail/0385.CALLER | 4 + test/mail/0428.CALLER | 2 + test/mail/0452.CALLER | 1 + test/mail/0461.CALLER | 3 + test/mail/0508.postmaster | 1 + test/mail/0522.CALLER | 2 + test/mail/0531.CALLER | 3 + test/mail/0536.oksender | 1 + test/mail/0536.user1 | 1 + test/mail/0536.user2 | 1 + test/mail/0573.limited | 1 + test/mail/0573.not_limited | 1 + ...5\207\340\244\271\340\245\210\340\244\202" | 1 + ...5\207\340\244\271\340\245\210\340\244\202" | 1 + ...5\207\340\244\271\340\245\210\340\244\202" | 1 + test/mail/4550.store | 1 + test/mail/4700.CALLER | 2 + test/mail/5101.copied | 2 + test/mail/5200.postmaster | 1 + test/mail/5204.CALLER | 1 + test/stderr/0388 | 2 + test/stdout/3412 | 1 + 74 files changed, 233 insertions(+), 56 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 293ff201a..cad1f5abb 100644 --- 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 72751c2dc..7433b5fb2 100644 --- 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 31c005773..d99f15465 100644 --- 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 f6cda37f2..31d033c1a 100644 --- 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 734e65833..1aef02aaf 100644 --- 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 f251d9711..aa2e0d9ca 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 8cdd7b30f..cac7613b3 100644 --- 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 To: CALLER@test.ex +References: Subject: Mail failure - no recipient addresses Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0021.ok b/test/mail/0021.ok index e061f8670..2691df465 100644 --- 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 To: ok@test2 +References: Subject: Mail failure - rejected by local scanning code Message-Id: 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 To: ok@test4 +References: Subject: Mail failure - rejected by local scanning code Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0021.userx b/test/mail/0021.userx index a290342b0..ee2f5a849 100644 --- 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 To: userx@test1 +References: Subject: Mail failure - rejected by local scanning code Message-Id: 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 To: userx@test1 +References: Subject: Mail failure - rejected by local scanning code Message-Id: 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 To: userx@test1 +References: Subject: Mail failure - rejected by local scanning code Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0032.CALLER b/test/mail/0032.CALLER index a3be6ebea..3551d5753 100644 --- 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 To: CALLER@myhost.ex +References: 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 1985986ea..5f667d13b 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 f7c2aea50..56f7a51cd 100644 --- 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 To: postmaster@test.ex +References: Subject: Message frozen Message-Id: 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 To: postmaster@test.ex +References: Subject: Message frozen Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0048.CALLER b/test/mail/0048.CALLER index fc1201e10..f457b8408 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 c3f9035e8..d7931d7c2 100644 --- 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 To: CALLER@myhost.ex +References: 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 To: CALLER@myhost.ex +References: 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 To: CALLER@myhost.ex +References: 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 To: CALLER@myhost.ex +References: 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 8022ff0b6..3a2ee9350 100644 --- 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 To: CALLER@myhost.ex +References: 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 To: CALLER@myhost.ex +References: 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 2f83f9116..1804b418d 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 5461909ff..afa48bfa3 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 511ecab32..16e7a1891 100644 --- 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 To: forwarder@test.ex +References: 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 To: forwarder@test.ex +References: 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 495410dae..7a53cce8b 100644 --- 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 To: CALLER@test.ex +References: 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 73c823601..f7938eb83 100644 --- 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 To: CALLER@test.ex +References: 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 dbc44d510..256103573 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 30f63c990..13bf30b33 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 f3cc605f8..8df061489 100644 --- 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 To: CALLER@test.ex +References: 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 7446098ff..1cc0d544d 100644 --- 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 To: CALLER@test.ex +References: 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 013adc142..30bddcaa7 100644 --- 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 To: CALLER@test.ex +References: 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 41420fb84..79944e6cb 100644 --- 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 To: CALLER@myhost.test.ex +References: 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 To: CALLER@myhost.test.ex +References: 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 To: CALLER@myhost.test.ex +References: 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 12511cd73..1501b9140 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 090003e8e..ee6af38b3 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 0b5653691..900785bee 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 1e9b1086c..2efa3588c 100644 --- 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 To: me@myhost.test.ex +References: Subject: Message frozen Message-Id: 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 To: me@myhost.test.ex +References: Subject: Message frozen on arrival Message-Id: 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 To: me@myhost.test.ex +References: Subject: Message frozen on arrival Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0237.CALLER b/test/mail/0237.CALLER index 9bd9e578c..4a1412c36 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 ea91b0187..09ce0e9ba 100644 --- 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 To: lmn@myhost.test.ex +References: 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 7292e9c19..0cf46b1d9 100644 --- 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 To: CALLER@test.ex +References: 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 6945aea73..996f8d0df 100644 --- 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 To: "abc@def"@unknown.domain +References: 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 7292e9c19..0cf46b1d9 100644 --- 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 To: CALLER@test.ex +References: 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 6945aea73..996f8d0df 100644 --- "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 To: "abc@def"@unknown.domain +References: 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 d6c32667d..144bf0131 100644 --- 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 To: CALLER@test.ex +References: 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 7a17cf16e..9abd0cc6b 100644 --- a/test/mail/0266.postmaster +++ b/test/mail/0266.postmaster @@ -11,6 +11,7 @@ Subject: error(s) in forwarding or filtering Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 +References: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +References: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +References: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +References: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +References: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +References: 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 d6c32667d..144bf0131 100644 --- 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 To: CALLER@test.ex +References: 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 3a6d43923..18ad82c96 100644 --- a/test/mail/0270.postmaster +++ b/test/mail/0270.postmaster @@ -11,6 +11,7 @@ Subject: error(s) in forwarding or filtering Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 +References: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +References: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +References: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +References: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +References: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +References: 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 4de58ff3f..1029f14de 100644 --- 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 To: spqr@test.ex +References: 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 To: abcd@test.ex +References: 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 cd98cab62..4169dc503 100644 --- 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 To: CALLER@myhost.test.ex +References: 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 c80c35ca8..7451024be 100644 --- 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 To: CALLER@myhost.test.ex +References: 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 0f5134528..b3ee1e863 100644 --- 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 To: CALLER@myhost.test.ex +References: 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 To: CALLER@myhost.test.ex +References: 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 f0df05d1f..01aae7fcd 100644 --- 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 To: anyone@anywhere +References: 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 To: anyone@anywhere +References: 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 f0df05d1f..01aae7fcd 100644 --- 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 To: anyone@anywhere +References: 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 To: anyone@anywhere +References: 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 b53186d4f..42a604112 100644 --- 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 To: CALLER@myhost.test.ex +References: 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 1a4ca2e5c..2be400b76 100644 --- 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 To: CALLER@myhost.test.ex +References: 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 1715e6169..891b20b3d 100644 --- 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 To: CALLER@test.ex +References: 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 e92bef1f1..15131c92b 100644 --- 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 To: CALLER@myhost.test.ex +References: 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 569d3f8bf..9dc76c961 100644 --- 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 To: CALLER@myhost.test.ex +References: 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 5fa158a16..817741767 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 721b15fcc..8f4f15a54 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 8feca08bc..dad1f7448 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 bda53558e..a0aac71f9 100644 --- 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 To: CALLER@test.ex +References: 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 7321dd6db..0f19a62b1 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 bd36b3d63..8a069ca13 100644 --- 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 To: postmaster@test.ex +References: 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 d718ca949..867dea897 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 b31f69571..fb54ab68f 100644 --- 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 To: CALLER@myhost.test.ex +References: 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 To: CALLER@myhost.test.ex +References: 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 To: CALLER@myhost.test.ex +References: 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 9c4b472cd..8a6490899 100644 --- 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 To: oksender@test.ex +References: 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 b918842f9..7be8501d9 100644 --- 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 To: user1@test.ex +References: Subject: Mail failure - rejected by local scanning code Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0536.user2 b/test/mail/0536.user2 index 64bd15814..33eb92a5b 100644 --- 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 To: user2@test.ex +References: Subject: Mail failure - rejected by local scanning code Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0573.limited b/test/mail/0573.limited index 25ddebc36..6c6cf5112 100644 --- 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 To: limited@myhost.test.ex +References: 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 62f89f072..e0f150907 100644 --- 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 To: not_limited@myhost.test.ex +References: 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.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" "b/test/mail/4203.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" index 35c0ea79f..b93a5b26f 100644 --- "a/test/mail/4203.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" +++ "b/test/mail/4203.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" @@ -9,6 +9,7 @@ X-Failed-Recipients: userz@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local +References: 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.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" "b/test/mail/4213.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" index 35c0ea79f..b93a5b26f 100644 --- "a/test/mail/4213.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" +++ "b/test/mail/4213.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" @@ -9,6 +9,7 @@ X-Failed-Recipients: userz@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local +References: 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.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" "b/test/mail/4223.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" index 35c0ea79f..b93a5b26f 100644 --- "a/test/mail/4223.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" +++ "b/test/mail/4223.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" @@ -9,6 +9,7 @@ X-Failed-Recipients: userz@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local +References: 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 bb8afeb2a..74d13383e 100644 --- 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 To: CALLER@myhost.test.ex +References: 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 bde98db7d..dd396d93d 100644 --- 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 To: CALLER@test.ex +References: 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 To: CALLER@test.ex +References: 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 253eb2c47..85470f9b9 100644 --- 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 To: CALLER@myhost.test.ex +References: 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 To: CALLER@myhost.test.ex +References: 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 0068db5da..b278ac42f 100644 --- 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 To: postmaster@test.ex +References: Subject: Message frozen Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/5204.CALLER b/test/mail/5204.CALLER index d7c62f07d..dce7a8350 100644 --- 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 To: CALLER@myhost.test.ex +References: 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 e11ca71b3..4d0629788 100644 --- 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 To: CALLER@myhost.test.ex +References: 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 T To: CALLER@myhost.test.ex + References: 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 613d6dbb1..80a4e1b38 100644 --- 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 To: CALLER@myhost.test.ex +References: Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender -- 2.25.1