git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Testsuite: munge for dns neg-cache
[exim.git] / test / mail / 0098.CALLER
diff --git a/test/mail/0098.CALLER b/test/mail/0098.CALLER
index ffb739e5efa7760e9624d56535e2eae4f4c3f7d6..64f1cf976fd23081221862e6801b9ec9aa597d7e 100644 (file)
--- a/test/mail/0098.CALLER
+++ b/test/mail/0098.CALLER
@@ -3,15 +3,17 @@ Return-path: <>
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
-       id 10HmaY-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaY-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-000000005vi-0000@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
-Subject: Warning: message 10HmaX-0005vi-00 delayed 0 minutes
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Subject: Warning: message 10HmaX-000000005vi-0000 delayed 0 minutes
+Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -21,7 +23,7 @@ This message was created automatically by mail delivery software.
 A message that you sent has not yet been delivered to one or more of its
 recipients after more than 0 minutes on the queue on the.local.host.name.
 
 A message that you sent has not yet been delivered to one or more of its
 recipients after more than 0 minutes on the queue on the.local.host.name.
 
-The message identifier is:     10HmaX-0005vi-00
+The message identifier is:     10HmaX-000000005vi-0000
 The date of the message is:    Tue, 2 Mar 1999 09:44:33 +0000
 
 The addresses to which the message has not yet been delivered are:
 The date of the message is:    Tue, 2 Mar 1999 09:44:33 +0000
 
 The addresses to which the message has not yet been delivered are:
@@ -42,8 +44,9 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: delayed
 Reporting-MTA: dns; the.local.host.name
 
 Action: delayed
-Final-Recipient: rfc822;|/non/existing/file
+Final-Recipient: rfc822;userx@test.ex
 Status: 4.0.0
 Status: 4.0.0
+
 Action: delayed
 Final-Recipient: rfc822;defer@test.ex
 Status: 4.0.0
 Action: delayed
 Final-Recipient: rfc822;defer@test.ex
 Status: 4.0.0
@@ -54,8 +57,9 @@ Content-type: text/rfc822-headers
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+       id 10HmaX-000000005vi-0000;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -67,15 +71,17 @@ Return-path: <>
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
-       id 10HmbA-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbA-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-000000005vi-0000@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
-Subject: Warning: message 10HmaZ-0005vi-00 delayed 0 minutes
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Subject: Warning: message 10HmaZ-000000005vi-0000 delayed 0 minutes
+Message-Id: <E10HmbA-000000005vi-0000@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -85,7 +91,7 @@ This message was created automatically by mail delivery software.
 A message that you sent has not yet been delivered to one or more of its
 recipients after more than 0 minutes on the queue on the.local.host.name.
 
 A message that you sent has not yet been delivered to one or more of its
 recipients after more than 0 minutes on the queue on the.local.host.name.
 
-The message identifier is:     10HmaZ-0005vi-00
+The message identifier is:     10HmaZ-000000005vi-0000
 The date of the message is:    Tue, 2 Mar 1999 09:44:33 +0000
 
 The addresses to which the message has not yet been delivered are:
 The date of the message is:    Tue, 2 Mar 1999 09:44:33 +0000
 
 The addresses to which the message has not yet been delivered are:
@@ -108,6 +114,7 @@ Reporting-MTA: dns; the.local.host.name
 Action: delayed
 Final-Recipient: rfc822;defer@test.ex
 Status: 4.0.0
 Action: delayed
 Final-Recipient: rfc822;defer@test.ex
 Status: 4.0.0
+
 Action: delayed
 Final-Recipient: rfc822;defer@another.test.ex
 Status: 4.0.0
 Action: delayed
 Final-Recipient: rfc822;defer@another.test.ex
 Status: 4.0.0
@@ -118,8 +125,9 @@ Content-type: text/rfc822-headers
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+       id 10HmaZ-000000005vi-0000;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -131,15 +139,17 @@ Return-path: <>
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
-       id 10HmbC-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbC-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-000000005vi-0000@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
-Subject: Warning: message 10HmaX-0005vi-00 delayed 0 minutes
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
+Subject: Warning: message 10HmaX-000000005vi-0000 delayed 0 minutes
+Message-Id: <E10HmbC-000000005vi-0000@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -149,7 +159,7 @@ This message was created automatically by mail delivery software.
 A message that you sent has not yet been delivered to one or more of its
 recipients after more than 0 minutes on the queue on the.local.host.name.
 
 A message that you sent has not yet been delivered to one or more of its
 recipients after more than 0 minutes on the queue on the.local.host.name.
 
-The message identifier is:     10HmaX-0005vi-00
+The message identifier is:     10HmaX-000000005vi-0000
 The date of the message is:    Tue, 2 Mar 1999 09:44:33 +0000
 
 The addresses to which the message has not yet been delivered are:
 The date of the message is:    Tue, 2 Mar 1999 09:44:33 +0000
 
 The addresses to which the message has not yet been delivered are:
@@ -170,8 +180,9 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: delayed
 Reporting-MTA: dns; the.local.host.name
 
 Action: delayed
-Final-Recipient: rfc822;|/non/existing/file
+Final-Recipient: rfc822;userx@test.ex
 Status: 4.0.0
 Status: 4.0.0
+
 Action: delayed
 Final-Recipient: rfc822;defer@test.ex
 Status: 4.0.0
 Action: delayed
 Final-Recipient: rfc822;defer@test.ex
 Status: 4.0.0
@@ -182,8 +193,9 @@ Content-type: text/rfc822-headers
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+       id 10HmaX-000000005vi-0000;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -195,15 +207,17 @@ Return-path: <>
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
-       id 10HmbE-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbE-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-000000005vi-0000@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
-Subject: Warning: message 10HmaX-0005vi-00 delayed by 10 minutes
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
+Subject: Warning: message 10HmaX-000000005vi-0000 delayed by 10 minutes
+Message-Id: <E10HmbE-000000005vi-0000@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -229,8 +243,9 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: delayed
 Reporting-MTA: dns; the.local.host.name
 
 Action: delayed
-Final-Recipient: rfc822;|/non/existing/file
+Final-Recipient: rfc822;userx@test.ex
 Status: 4.0.0
 Status: 4.0.0
+
 Action: delayed
 Final-Recipient: rfc822;defer@test.ex
 Status: 4.0.0
 Action: delayed
 Final-Recipient: rfc822;defer@test.ex
 Status: 4.0.0
@@ -241,8 +256,9 @@ Content-type: text/rfc822-headers
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+       id 10HmaX-000000005vi-0000;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -254,15 +270,17 @@ Return-path: <>
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
-       id 10HmbF-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbF-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-000000005vi-0000@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
-Subject: Warning: message 10HmaZ-0005vi-00 delayed by 0 minutes
-Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
+Subject: Warning: message 10HmaZ-000000005vi-0000 delayed by 0 minutes
+Message-Id: <E10HmbF-000000005vi-0000@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -290,6 +308,7 @@ Reporting-MTA: dns; the.local.host.name
 Action: delayed
 Final-Recipient: rfc822;defer@test.ex
 Status: 4.0.0
 Action: delayed
 Final-Recipient: rfc822;defer@test.ex
 Status: 4.0.0
+
 Action: delayed
 Final-Recipient: rfc822;defer@another.test.ex
 Status: 4.0.0
 Action: delayed
 Final-Recipient: rfc822;defer@another.test.ex
 Status: 4.0.0
@@ -300,8 +319,9 @@ Content-type: text/rfc822-headers
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+       id 10HmaZ-000000005vi-0000;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -313,15 +333,17 @@ Return-path: <>
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
-       id 10HmbG-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbG-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbB-000000005vi-0000@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
-Subject: Warning: message 10HmbB-0005vi-00 delayed by 0 minutes
-Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
+Subject: Warning: message 10HmbB-000000005vi-0000 delayed by 0 minutes
+Message-Id: <E10HmbG-000000005vi-0000@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -353,9 +375,10 @@ Content-type: text/rfc822-headers
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmbB-0005vi-00
-       for xxxx@some.domain; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
+       id 10HmbB-000000005vi-0000
+       for xxxx@some.domain;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbB-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -367,15 +390,17 @@ Return-path: <>
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
-       id 10HmbH-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbH-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmbD-000000005vi-0000@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
-Subject: Warning: message 10HmbD-0005vi-00 delayed by 0 minutes
-Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
+Subject: Warning: message 10HmbD-000000005vi-0000 delayed by 0 minutes
+Message-Id: <E10HmbH-000000005vi-0000@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -407,9 +432,76 @@ Content-type: text/rfc822-headers
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmbD-0005vi-00
-       for yyyy@connection.refused; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
+       id 10HmbD-000000005vi-0000
+       for yyyy@connection.refused;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbD-000000005vi-0000@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Return-path: <>
+Envelope-to: CALLER@test.ex
+Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
+Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
+       id 10HmbN-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Auto-Submitted: auto-replied
+From: Mail Delivery System <Mailer-Daemon@test.ex>
+To: CALLER@test.ex
+References: <E10HmbM-000000005vi-0000@the.local.host.name>
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
+Subject: Warning: message 10HmbM-000000005vi-0000 delayed 0 minutes
+Message-Id: <E10HmbN-000000005vi-0000@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
+This message was created automatically by mail delivery software.
+A message that you sent has not yet been delivered to one or more of its
+recipients after more than 0 minutes on the queue on the.local.host.name.
+
+The message identifier is:     10HmbM-000000005vi-0000
+The subject of the message is: testing a remote defer
+The date of the message is:    Tue, 2 Mar 1999 09:44:33 +0000
+
+The address to which the message has not yet been delivered is:
+
+  rrrr@remote.defer
+    Delay reason: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<rrrr@remote.defer>:
+    451 Over-quota
+
+No action is required on your part. Delivery attempts will continue for
+some time, and this warning may be repeated at intervals if the message
+remains undelivered. Eventually the mail delivery software will give up,
+and when that happens, the message will be returned to you.
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: delayed
+Final-Recipient: rfc822;rrrr@remote.defer
+Status: 4.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/rfc822-headers
+
+Return-path: <CALLER@test.ex>
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+       (envelope-from <CALLER@test.ex>)
+       id 10HmbM-000000005vi-0000
+       for rrrr@remote.defer;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Subject: testing a remote defer
+Message-Id: <E10HmbM-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
Master Exim source repository