Move DSN support to mainline

[exim.git] / test / mail / 0374.CALLER

diff --git a/test/mail/0374.CALLER b/test/mail/0374.CALLER
index df8b523c719bc1ebb22b061e8dd660f1bfc217c9..6cbbe15a02431a30c50ace1565d30923ba9560e7 100644 (file)
--- a/test/mail/0374.CALLER
+++ b/test/mail/0374.CALLER
@@ -9,10 +9,15 @@ X-Failed-Recipients: d3@myhost.test.ex,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+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.
 
 A message that you sent could not be delivered to one or more of its
@@ -25,7 +30,22 @@ recipients. This is a permanent error. The following address(es) failed:
   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; 0
+
+--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)
@@ -36,3 +56,5 @@ From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+