tidying

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

diff --git a/test/mail/0032.CALLER b/test/mail/0032.CALLER
index 034296f5b6b50b8f99d4ae30fbbffb1afaf85e70..ef3e2dde636718b2fbda970a2f407a77ad32e5be 100644 (file)
--- a/test/mail/0032.CALLER
+++ b/test/mail/0032.CALLER
@@ -4,15 +4,22 @@ Envelope-to: CALLER@myhost.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00

-       for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for CALLER@myhost.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 X-Failed-Recipients: userx@mxt1.test.ex
 Auto-Submitted: auto-replied
 X-Failed-Recipients: userx@mxt1.test.ex
 Auto-Submitted: auto-replied

-From: Mail Delivery System <Mailer-Daemon@myhost.ex>
+From: MailProgram <xyz@some.where>

 To: CALLER@myhost.ex
 To: CALLER@myhost.ex

+References: <E10HmaX-0005vi-00@myhost.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.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmaY-0005vi-00@myhost.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
 This message was created automatically by mail delivery software.
 
 A message that you sent could not be delivered to one or more of its


@@ -21,16 +28,29 @@ recipients. This is a permanent error. The following address(es) failed:
   userx@mxt1.test.ex
     lowest numbered MX record points to local host
 
   userx@mxt1.test.ex
     lowest numbered MX record points to local host
 

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.ex
+
+Action: failed
+Final-Recipient: rfc822;userx@mxt1.test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

 
 Return-path: <CALLER@myhost.ex>
 Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaX-0005vi-00
 
 Return-path: <CALLER@myhost.ex>
 Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaX-0005vi-00

-       for userx@mxt1.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for userx@mxt1.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
 Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+