Testsuite: debug output changes resulting

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

diff --git a/test/mail/0536.oksender b/test/mail/0536.oksender
index e92c7c60689456cbb2f09c289bcd2c88d7f69db4..80b2afb55f534802c8f622254e146f4c649c5d64 100644 (file)
--- a/test/mail/0536.oksender
+++ b/test/mail/0536.oksender
@@ -1,14 +1,21 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-       id 10HmbC-0005vi-00
-       for oksender@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+       id 10HmbC-000000005vi-0000
+       for oksender@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: user22@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: oksender@test.ex
+References: <E10HmbB-000000005vi-0000@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: <E10HmbC-000000005vi-0000@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.
 
@@ -18,15 +25,28 @@ recipients. This is a permanent error. The following address(es) failed:
   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)
        (envelope-from <oksender@test.ex>)
-       id 10HmbB-0005vi-00
-       for user22@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+       id 10HmbB-000000005vi-0000
+       for user22@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex>
 From: oksender@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--