Merge branch 'exim-4.96+security' into master+security

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

diff --git a/test/mail/0280.CALLER b/test/mail/0280.CALLER
index 76002d9716d12b5cb0986479118cc96fd6b13776..9597ecd7ba7bac2ae29536f82efa6fcb691e3ad5 100644 (file)
--- a/test/mail/0280.CALLER
+++ b/test/mail/0280.CALLER
@@ -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 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaY-000000005vi-0000;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: spqr@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: spqr@test.ex
+References: <E10HmaX-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: <E10HmaY-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmaY-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.
 
 A message that you sent could not be delivered to one or more of its
@@ -17,29 +24,49 @@ recipients. This is a permanent error. The following address(es) failed:
   spqr@test.ex
     Unrouteable address
 
------- 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;spqr@test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 Return-path: <spqr@test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <spqr@test.ex>)
-       id 10HmaX-0005vi-00
-       for spqr@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+       id 10HmaX-000000005vi-0000
+       for spqr@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
 From: spqr@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-       id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbA-000000005vi-0000;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: abcd@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: abcd@test.ex
+References: <E10HmaZ-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: <E10HmbA-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbA-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.
 
 A message that you sent could not be delivered to one or more of its
@@ -48,15 +75,28 @@ recipients. This is a permanent error. The following address(es) failed:
   abcd@test.ex
     Unrouteable address
 
------- 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;abcd@test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 Return-path: <abcd@test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <abcd@test.ex>)
-       id 10HmaZ-0005vi-00
-       for abcd@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+       id 10HmaZ-000000005vi-0000
+       for abcd@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>
 From: abcd@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+