Merge branch 'master' into 4.next

[users/jgh/exim.git] / test / mail / 0536.oksender

diff --git a/test/mail/0536.oksender b/test/mail/0536.oksender
index 9a3e0ea343ea9353e303ab88ad54c523f29d5601..9c4b472cdbafe6dfde6073feb990e2cc5929b310 100644 (file)
--- a/test/mail/0536.oksender
+++ b/test/mail/0536.oksender
@@ -6,10 +6,15 @@ X-Failed-Recipients: user22@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: oksender@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: oksender@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: <E10HmbC-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbC-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
 This message was created automatically by mail delivery software.
 
 A message that you sent could not be delivered to one or more of its


@@ -18,7 +23,17 @@ recipients. This is a permanent error. The following address(es) failed:
   user22@test.ex
     590 5.4.3 Main and extended code
 
   user22@test.ex
     590 5.4.3 Main and extended code
 

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

 
 Return-path: <oksender@test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 
 Return-path: <oksender@test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)


@@ -30,3 +45,5 @@ From: oksender@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+