SPF: fix handling mix of spf and other txt records. 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 6012cfdebd15b970fa7c78c564d32e507d0eedf2..77258a8e884e5f95b91c93e2949a061dd2f80412 100644 (file)
--- a/test/scripts/4600-SPF/4601
+++ b/test/scripts/4600-SPF/4601
@@ -25,8 +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
-${lookup {fred@double.example.com} spf {8.8.8.8}}
-${lookup {fred@uppercase.example.com} 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}}
 ****