Merge branch 'hs/taintwarn'

[exim.git] / test / mail / 0508.postmaster

diff --git a/test/mail/0508.postmaster b/test/mail/0508.postmaster
index d2ead9f04f93570d48f784f275b65ee8614d432e..0f3ea3d84a3880ac941f4f0e55a9a086e5a3e9f0 100644 (file)
--- a/test/mail/0508.postmaster
+++ b/test/mail/0508.postmaster
@@ -1,15 +1,22 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00

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

 X-Failed-Recipients: userx@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: postmaster@test.ex
 X-Failed-Recipients: userx@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: postmaster@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
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Subject: Mail delivery failed
 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 sent by
 This message was created automatically by mail delivery software.
 
 A message sent by


@@ -29,14 +36,27 @@ The following text was generated during the delivery attempt:
 
 Some pipe output
 
 
 Some pipe output
 

------- 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;userx@myhost.test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

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

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

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

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+