From 559728d4fbbfcec54c52aa2b66b2816e4c83b715 Mon Sep 17 00:00:00 2001
From: mind04 <mind04@monshouwer.org>
Date: Sun, 24 Nov 2013 06:34:00 -0500
Subject: [PATCH] add SPF record to test.com and make recent named-checkzone
 happy

---
 modules/tinydnsbackend/data                   |   1 +
 modules/tinydnsbackend/data.cdb               | Bin 1350485 -> 1350577 bytes
 .../tinydns-data-check/expected_result        |   4 ++--
 regression-tests/ent-axfr/expected_result     |   2 +-
 .../ent-axfr/expected_result.nsec3            |   2 +-
 .../ent-axfr/expected_result.nsec3-optout     |   2 +-
 regression-tests/test.com                     |   1 +
 7 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data
index 357a06b6fc..6ea9813a21 100644
--- a/modules/tinydnsbackend/data
+++ b/modules/tinydnsbackend/data
@@ -20160,6 +20160,7 @@ Ztest.com:ns1.test.com.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600
 :_root._tcp.dc.test.com:33:\000\000\000\000\000\000\000:3600
 :enum.test.com:35:\000d\0002\001u\007e2u\053sip\000\010testuser\006domain\003com\000:3600
 :hightxt.test.com:16:\042v\075spf1\040mx\040ip4\07278.46.192.210\040\342\200\223all:3600
+:hightxt.test.com:99:\042v\075spf1\040mx\040ip4\07278.46.192.210\040\342\200\223all:3600
 +ns1.test.com:1.1.1.1:3600
 +ns2.test.com:2.2.2.2:3600
 +server1.test.com:1.2.3.4:3600
diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb
index 9b76b88f1298b8b4f9c31186f8f25a9e381509d4..2f990da0f7f91700354a036fd0d18eac031e3f82 100644
GIT binary patch
delta 3917
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
E0gL=G-T(jq

delta 3890
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
SOwE&r$7n)DguE?Z>+^qXBvbnU

diff --git a/regression-tests.nobackend/tinydns-data-check/expected_result b/regression-tests.nobackend/tinydns-data-check/expected_result
index 8507d6fea5..e1ae22d454 100644
--- a/regression-tests.nobackend/tinydns-data-check/expected_result
+++ b/regression-tests.nobackend/tinydns-data-check/expected_result
@@ -1,5 +1,5 @@
 4bc48a8d9b8d04b553be67639e5656e8  ../regression-tests/example.com
-a2dd754820cb88fdd3d80b54a212a270  ../regression-tests/test.com
+4e9eed426f0cd123c08dffb9e715824a  ../regression-tests/test.com
 005b3381db2a7dc70b690484f6ab7770  ../regression-tests/test.dyndns
 21213b4e8cd56e4184696a1bafd987d7  ../regression-tests/wtest.com
 42b442de632686e94bde75acf66cf524  ../regression-tests/nztest.com
@@ -9,4 +9,4 @@ a63dc120391d9df0003f2ec4f461a6af  ../regression-tests/secure-delegated.dnssec-pa
 24514dc104b22206daeb973ff9303545  ../regression-tests/minimal.com
 0b20d7a0250576451135483b863750bf  ../regression-tests/tsig.com
 b1f775045fa2cf0a3b91aa834af06e49  ../regression-tests/stest.com
-4d3d89309ee74b0b7c44042de92eb9e1  ../modules/tinydnsbackend/data.cdb
+2e24a38e3e23ce40da06f41417f91c42  ../modules/tinydnsbackend/data.cdb
diff --git a/regression-tests/ent-axfr/expected_result b/regression-tests/ent-axfr/expected_result
index 69d487f0b0..165f74719b 100644
--- a/regression-tests/ent-axfr/expected_result
+++ b/regression-tests/ent-axfr/expected_result
@@ -9,7 +9,7 @@ b.c.test.com.	86400	IN	NSEC	*.a.b.c.test.com. A RRSIG NSEC
 blah.test.com.	86400	IN	NSEC	b.c.test.com. NS RRSIG NSEC 
 counter.test.com.	86400	IN	NSEC	_double._tcp.dc.test.com. A RRSIG NSEC 
 enum.test.com.	86400	IN	NSEC	hightxt.test.com. NAPTR RRSIG NSEC 
-hightxt.test.com.	86400	IN	NSEC	ns1.test.com. TXT RRSIG NSEC 
+hightxt.test.com.	86400	IN	NSEC	ns1.test.com. TXT RRSIG NSEC SPF 
 ns1.test.com.	86400	IN	NSEC	ns2.test.com. A RRSIG NSEC 
 ns2.test.com.	86400	IN	NSEC	server1.test.com. A RRSIG NSEC 
 server1.test.com.	86400	IN	NSEC	*.test.test.com. A RP RRSIG NSEC 
diff --git a/regression-tests/ent-axfr/expected_result.nsec3 b/regression-tests/ent-axfr/expected_result.nsec3
index 407e9e0ae8..3856c6d090 100644
--- a/regression-tests/ent-axfr/expected_result.nsec3
+++ b/regression-tests/ent-axfr/expected_result.nsec3
@@ -1,4 +1,4 @@
-0bh8di769i8vvtkdds8efjda19abigo5.test.com.	86400	IN	NSEC3	1 0 1 abcd  2eu2gulbu53h9uvhfalshpbo2a83t6l2 TXT RRSIG 
+0bh8di769i8vvtkdds8efjda19abigo5.test.com.	86400	IN	NSEC3	1 0 1 abcd  2eu2gulbu53h9uvhfalshpbo2a83t6l2 TXT RRSIG SPF 
 2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.	86400	IN	NSEC3	1 0 1 abcd  2gks2n3jpqf62qohavfq1pholm3hr7ra NS SOA MX RRSIG DNSKEY NSEC3PARAM 
 2gks2n3jpqf62qohavfq1pholm3hr7ra.test.com.	86400	IN	NSEC3	1 0 1 abcd  53l445r26rg1csbi4ts1k3i3el1f30vm TXT RRSIG 
 53l445r26rg1csbi4ts1k3i3el1f30vm.test.com.	86400	IN	NSEC3	1 0 1 abcd  79ra8k3g5kai1hg9jlhbr6p0tp933m7v SRV RRSIG 
diff --git a/regression-tests/ent-axfr/expected_result.nsec3-optout b/regression-tests/ent-axfr/expected_result.nsec3-optout
index 457931e9fd..561cf08557 100644
--- a/regression-tests/ent-axfr/expected_result.nsec3-optout
+++ b/regression-tests/ent-axfr/expected_result.nsec3-optout
@@ -1,4 +1,4 @@
-0bh8di769i8vvtkdds8efjda19abigo5.test.com.	86400	IN	NSEC3	1 1 1 abcd  2eu2gulbu53h9uvhfalshpbo2a83t6l2 TXT RRSIG 
+0bh8di769i8vvtkdds8efjda19abigo5.test.com.	86400	IN	NSEC3	1 1 1 abcd  2eu2gulbu53h9uvhfalshpbo2a83t6l2 TXT RRSIG SPF 
 2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com.	86400	IN	NSEC3	1 1 1 abcd  2gks2n3jpqf62qohavfq1pholm3hr7ra NS SOA MX RRSIG DNSKEY NSEC3PARAM 
 2gks2n3jpqf62qohavfq1pholm3hr7ra.test.com.	86400	IN	NSEC3	1 1 1 abcd  53l445r26rg1csbi4ts1k3i3el1f30vm TXT RRSIG 
 53l445r26rg1csbi4ts1k3i3el1f30vm.test.com.	86400	IN	NSEC3	1 1 1 abcd  79ra8k3g5kai1hg9jlhbr6p0tp933m7v SRV RRSIG 
diff --git a/regression-tests/test.com b/regression-tests/test.com
index 1f7f1c63de..142dea3b25 100644
--- a/regression-tests/test.com
+++ b/regression-tests/test.com
@@ -36,3 +36,4 @@ b.c			IN	A	5.6.7.8
 *.a.b.c			IN	A	8.7.6.5
 aland		IN TXT "\195\133LAND ISLANDS"
 hightxt		IN	TXT	"v=spf1 mx ip4:78.46.192.210 –all"
+hightxt		IN	SPF	"v=spf1 mx ip4:78.46.192.210 –all"
-- 
2.47.2