X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/afda344b580b54a4513569720aec3260cd5ba546..37b849dca4dfd855212a763662825e:/test/mail/0224.CALLER

diff --git a/test/mail/0224.CALLER b/test/mail/0224.CALLER
index a2dea13eb..ff7a09456 100644
--- a/test/mail/0224.CALLER
+++ b/test/mail/0224.CALLER
@@ -3,16 +3,23 @@ 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 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
 X-Failed-Recipients: bounce@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
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Message-Id: <E10HmaY-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 could not be delivered to one or more of its
@@ -24,37 +31,61 @@ recipients. This is a permanent error. The following address(es) failed:
   an undisclosed address
     (generated from useryx@test.ex)
 
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;useryx@test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;userxx@test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 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
+	id 10HmaX-000000005vi-0000;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: first message
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Message-Id: <E10HmaX-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 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
-Subject: Warning: message 10HmaZ-0005vi-00 delayed 0 minutes
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+References: <E10HmaZ-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 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
+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:     10HmaZ-0005vi-00
+The message identifier is:     10HmaZ-000000005vi-0000
 The subject of the message is: second message
 The date of the message is:    Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -73,3 +104,36 @@ 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;file@test.ex
+Status: 4.0.0
+
+Action: delayed
+Final-Recipient: rfc822;userxy@test.ex
+Status: 4.0.0
+
+Action: delayed
+Final-Recipient: rfc822;useryy@test.ex
+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 10HmaZ-000000005vi-0000;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Subject: second message
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+