X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/2709ca2632f61d2ebcdf5ef2040b5b7068fd6a96..71c8c2ef07fabc64c4b56b6eee1eeffb88a8f5e0:/test/mail/0374.CALLER

diff --git a/test/mail/0374.CALLER b/test/mail/0374.CALLER
index 1b7454e1a..15131c92b 100644
--- a/test/mail/0374.CALLER
+++ b/test/mail/0374.CALLER
@@ -4,14 +4,20 @@ Envelope-to: CALLER@myhost.test.ex
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmaY-0005vi-00
 	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: d3@myhost.test.ex,
   b1@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+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.
 
@@ -19,19 +25,38 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   d3@myhost.test.ex
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>:
-  host 127.0.0.1 [127.0.0.1]: 550 hard error
+    550 hard error
   b1@myhost.test.ex
     local delivery failed
 
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;b1@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;d3@myhost.test.ex
+Status: 5.0.0
+Remote-MTA: dns; 127.0.0.1
+Diagnostic-Code: smtp; 550 hard error
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 Return-path: <CALLER@myhost.test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--