summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorWolfgang Breyha <wbreyha@gmx.net>2020-01-07 13:03:18 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2020-01-07 13:03:18 +0000
commit67794d2b830fc580f87b0635718d95e32b467be1 (patch)
tree0c18e4d3e30ea5ed49da4dd1bf5bbf7aeea2de6b /test
parentccbb15c9d7d7cac10228311aa1c7e448343a345d (diff)
SPF: fix result for case of only non-spf TXT RRs. Bug 2499
Diffstat (limited to 'test')
-rw-r--r--test/scripts/4600-SPF/460117
-rw-r--r--test/stdout/460111
2 files changed, 14 insertions, 14 deletions
diff --git a/test/scripts/4600-SPF/4601 b/test/scripts/4600-SPF/4601
index 96f06a6d1..5e6602ab0 100644
--- 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}}
****
diff --git a/test/stdout/4601 b/test/stdout/4601
index cbb4cf502..38eefab33 100644
--- a/test/stdout/4601
+++ b/test/stdout/4601
@@ -26,9 +26,10 @@ Connecting to 127.0.0.1 port 1224 ... connected
<<< 250 Accepted
>>> quit
End of script
-> none none
-> temperror temperror
-> permerror permerror
-> permerror permerror
-> pass pass
+> eDNS_NOMATCH none none
+> eDNS_AGAIN temperror temperror
+> multiple rr permerror permerror
+> multi + non-spf permerror permerror
+> uppercase in v= pass pass
+> only non-spf txt none none
>