From: mind04 Date: Sun, 24 Nov 2013 11:34:00 +0000 (-0500) Subject: add SPF record to test.com and make recent named-checkzone happy X-Git-Tag: auth-3.3.1~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=665586e98f9c479ba2e99f432be068e09483c703;p=thirdparty%2Fpdns.git add SPF record to test.com and make recent named-checkzone happy Conflicts: modules/tinydnsbackend/data.cdb regression-tests.nobackend/tinydns-data-check/expected_result --- diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data index 63a08f5b7a..0cbeecff14 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 2d6d6642aa..7335b8aaee 100644 Binary files a/modules/tinydnsbackend/data.cdb and b/modules/tinydnsbackend/data.cdb differ diff --git a/regression-tests.nobackend/tinydns-data-check/expected_result b/regression-tests.nobackend/tinydns-data-check/expected_result index 70dd7577c1..49048dbd5c 100644 --- a/regression-tests.nobackend/tinydns-data-check/expected_result +++ b/regression-tests.nobackend/tinydns-data-check/expected_result @@ -1,8 +1,8 @@ 4bc48a8d9b8d04b553be67639e5656e8 ../regression-tests/example.com -a2dd754820cb88fdd3d80b54a212a270 ../regression-tests/test.com +4e9eed426f0cd123c08dffb9e715824a ../regression-tests/test.com 21213b4e8cd56e4184696a1bafd987d7 ../regression-tests/wtest.com 6e4ac6e3a6cd717df107a7bc2e466ac7 ../regression-tests/dnssec-parent.com 42dd3a56c7d268e75836371878819ec4 ../regression-tests/delegated.dnssec-parent.com a63dc120391d9df0003f2ec4f461a6af ../regression-tests/secure-delegated.dnssec-parent.com 24514dc104b22206daeb973ff9303545 ../regression-tests/minimal.com -a7eda9fdfd9a73961338ad661526c39c ../modules/tinydnsbackend/data.cdb +7f73abee007473dcd0a2d2e21e64f7f3 ../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"