From 559728d4fbbfcec54c52aa2b66b2816e4c83b715 Mon Sep 17 00:00:00 2001 From: mind04 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 357a06b6f..6ea9813a2 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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 GJ^l-e{4w4D delta 3890 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 TGQB_^9j6JG67sryb>RO1Y$Q|r diff --git a/regression-tests.nobackend/tinydns-data-check/expected_result b/regression-tests.nobackend/tinydns-data-check/expected_result index 8507d6fea..e1ae22d45 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 69d487f0b..165f74719 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 407e9e0ae..3856c6d09 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 457931e9f..561cf0855 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 1f7f1c63d..142dea3b2 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.50.1