SPF: fix handling mix of spf and other txt records. Bug 2499

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

diff --git a/test/mail/0176.CALLER b/test/mail/0176.CALLER
index 0b5a235974b5922adef9f9bec8c26238af40d13f..1cc0d544ddee44aa7b8991e7d497139ce4bb758a 100644 (file)
--- a/test/mail/0176.CALLER
+++ b/test/mail/0176.CALLER
@@ -6,10 +6,16 @@ X-Failed-Recipients: someone@somewhere
 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

+References: <E10HmaX-0005vi-00@the.local.host.name>
+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@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 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


@@ -17,7 +23,17 @@ recipients. This is a permanent error. The following address(es) failed:
 
   someone@somewhere
 
 
   someone@somewhere
 

------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;someone@somewhere
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822

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


@@ -30,3 +46,5 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message or other.
 
 
 Some message or other.
 

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+