SPF: better buld compatibility with OpenBSD

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

diff --git a/test/mail/0428.CALLER b/test/mail/0428.CALLER
index 2cea2cb9bc4f34cc4faa2857fbd093acafad4153..ff0af0de3d34635df6c5b046992f655e07d84f6b 100644 (file)
--- a/test/mail/0428.CALLER
+++ b/test/mail/0428.CALLER
@@ -9,10 +9,15 @@ X-Failed-Recipients: restrict-userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@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@mail.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbC-0005vi-00@mail.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


@@ -21,7 +26,17 @@ recipients. This is a permanent error. The following address(es) failed:
   save to userx-extra
     generated by restrict-userx@test.ex
 
   save to userx-extra
     generated by restrict-userx@test.ex
 

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

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


@@ -35,6 +50,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 5
 
 
 Test 5
 

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+

 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Envelope-to: CALLER@test.ex
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Envelope-to: CALLER@test.ex


@@ -46,10 +63,15 @@ X-Failed-Recipients: restrict-userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@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: <E10HmbE-0005vi-00@mail.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmbE-0005vi-00@mail.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


@@ -58,7 +80,17 @@ recipients. This is a permanent error. The following address(es) failed:
   save to inbox
     generated by restrict-userx@test.ex
 
   save to inbox
     generated by restrict-userx@test.ex
 

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

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


@@ -72,3 +104,5 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 6
 
 
 Test 6
 

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+