From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 28 Dec 2019 17:44:28 +0000 (+0000)
Subject: Testsuite: SPF testcase additions
X-Git-Tag: exim-4_94_RC0~185
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b17ea87dd9582c2fb0e637c246211fb5328065be;p=exim.git

Testsuite: SPF testcase additions
---

diff --git a/test/dnszones-src/db.example.com b/test/dnszones-src/db.example.com
index 6b35113e2..b12d9a6a6 100644
--- a/test/dnszones-src/db.example.com
+++ b/test/dnszones-src/db.example.com
@@ -28,6 +28,10 @@ example.com.	TXT     v=spf1 -all
 double		TXT	v=spf1 include:_spf.google.com ~all
 		TXT	v=spf1 +a +mx -all
 
+doubleplus	TXT	v=spf1 include:_spf.google.com ~all
+		TXT	google-site-verification=q-4MSVLjluQIsBztu5jzJBxAcJXzNcHAk0jHTZEamB8
+		TXT	v=spf1 +a +mx -all
+
 uppercase	TXT	v=sPf1 +all
 
 ; Alias A record for the local host, under the name "server1"
diff --git a/test/scripts/4600-SPF/4601 b/test/scripts/4600-SPF/4601
index 6012cfdeb..72ef10d3f 100644
--- 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@test.again.dns} spf {HOSTIPV4}}
 ${lookup {fred@double.example.com} spf {8.8.8.8}}
+${lookup {fred@doubleplus.example.com} spf {8.8.8.8}}
 ${lookup {fred@uppercase.example.com} spf {HOSTIPV4}}
 ****