SPF: fix result for case of only non-spf TXT RRs. Bug 2499

[users/jgh/exim.git] / test / stdout / 5402

diff --git a/test/stdout/5402 b/test/stdout/5402
index aa2bdcaab7ee880a0acc07e236fae6df2806cd69..1aa55964edd396ef67622f647f53b7b286ab0adc 100644 (file)
--- a/test/stdout/5402
+++ b/test/stdout/5402
@@ -6,6 +6,15 @@
 250 HELP\r
 250 OK\r
 250 Accepted\r
 250 HELP\r
 250 OK\r
 250 Accepted\r

+221 myhost.test.ex closing connection\r
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250-myhost.test.ex Hello CALLER at myhost.test.ex\r
+250-SIZE 52428800\r
+250-8BITMIME\r
+250-PIPELINING\r
+250 HELP\r
+250 OK\r
+250 Accepted\r

 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 myhost.test.ex closing connection\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 myhost.test.ex closing connection\r


@@ -15,11 +24,22 @@ Listening on port 1224 ...
 Connection request from [ip4.ip4.ip4.ip4]
 220 ESMTP
 EHLO myhost.test.ex
 Connection request from [ip4.ip4.ip4.ip4]
 220 ESMTP
 EHLO myhost.test.ex

-250-OK
-250 SIZE 65536
-MAIL FROM:<fred@myhost.test.ex> SIZE=ssss
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<dest@domain.com>
+250 Recipient OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [ip4.ip4.ip4.ip4]
+220 ESMTP
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>

 250 Sender OK
 250 Sender OK

-RCPT TO:<userx@domain.com>
+RCPT TO:<dest@domain.com>

 250 Recipient OK
 DATA
 354 Send data
 250 Recipient OK
 DATA
 354 Send data


@@ -27,11 +47,10 @@ Received: from CALLER (helo=myhost.test.ex)
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00

-       for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+       for dest@domain.com; Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

-X-hdr-rtr-new: +++

 
 .
 250 OK
 
 .
 250 OK