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

[users/jgh/exim.git] / test / scripts / 4600-SPF / 4601

diff --git a/test/scripts/4600-SPF/4601 b/test/scripts/4600-SPF/4601
index 96f06a6d12fa2a7807399f148d70bc0178a15632..5e6602ab02926087b407a81cdf508ebb4b16cb20 100644 (file)
--- a/test/scripts/4600-SPF/4601
+++ b/test/scripts/4600-SPF/4601
@@ -25,14 +25,13 @@ quit
 #
 killdaemon
 #
-# SERVFAIL -> temperror
-# A multiple spf-RR return should get permerror
-# - and not crash with non-spf txt records
-# v=spf1 is casr-insensitive
+#
+#
 exim -be
-none      ${lookup {fred@v6.test.ex} spf {HOSTIPV4}}
-temperror ${lookup {fred@test.again.dns} spf {HOSTIPV4}}
-permerror ${lookup {fred@double.example.com} spf {8.8.8.8}}
-permerror ${lookup {fred@doubleplus.example.com} spf {8.8.8.8}}
-pass      ${lookup {fred@uppercase.example.com} spf {HOSTIPV4}}
+eDNS_NOMATCH       none      ${lookup {fred@v6.test.ex} spf {HOSTIPV4}}
+eDNS_AGAIN         temperror ${lookup {fred@test.again.dns} spf {HOSTIPV4}}
+multiple rr        permerror ${lookup {fred@double.example.com} spf {8.8.8.8}}
+multi + non-spf    permerror ${lookup {fred@doubleplus.example.com} spf {8.8.8.8}}
+uppercase in v=    pass      ${lookup {fred@uppercase.example.com} spf {HOSTIPV4}}
+only non-spf txt   none      ${lookup {fred@test.ex} spf {HOSTIPV4}}
 ****