From: Peter van Dijk Date: Sun, 21 Feb 2016 12:58:01 +0000 (+0100) Subject: add host+zone for auto ptr testing X-Git-Tag: auth-4.0.5~1^2~4^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2296328cd3aa18492431e9a69a1e1a6e94efb1f;p=thirdparty%2Fpdns.git add host+zone for auto ptr testing (cherry picked from commit ff2c5a4a5c0aaab016dda92252b0052595c9750d) --- diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data index 4f79ef661b..40f1f03d5e 100644 --- a/modules/tinydnsbackend/data +++ b/modules/tinydnsbackend/data @@ -20011,6 +20011,7 @@ +host-9997.example.com:192.168.1.13:120 +host-9998.example.com:192.168.1.14:120 +host-9999.example.com:192.168.1.15:120 ++host-for-auto-ptr.example.com:192.0.2.1:120 +host.\052.sub.example.com:192.168.6.1:120 +italy-ns1.example.com:192.168.5.1:120 +italy-ns2.example.com:192.168.5.2:120 @@ -20284,3 +20285,7 @@ Zstest.com:ns1.example.com.:ahu.example.com.:2000081501:28800:7200:604800:86400: +ns1.cdnskey-cds-test.com:1.1.1.1:3600 +ns2.cdnskey-cds-test.com:2.2.2.2:3600 Zcdnskey-cds-test.com:ns1.cdnskey-cds-test.:ahu.example.com.:2005092501:28800:7200:604800:86400:3600 +#2000081501 auto axfr-get +&2.0.192.in-addr.arpa::ns1.example.com.:120 +&2.0.192.in-addr.arpa::ns2.example.com.:120 +Z2.0.192.in-addr.arpa:ns1.example.com.:ahu.example.com.:2000081501:28800:7200:604800:86400:120 diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb index 6934c6d183..40206e6c4a 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 005e6e8882..479c243168 100644 --- a/regression-tests.nobackend/tinydns-data-check/expected_result +++ b/regression-tests.nobackend/tinydns-data-check/expected_result @@ -1,4 +1,4 @@ -3c2f2cbef7b196a68d39a77dd7a5eaf7 ../regression-tests/zones/example.com +17a1219ca79020c1c67ad173a291d3c8 ../regression-tests/zones/example.com fe49d2784b1bcc3b91ddd5619f0b6cc1 ../regression-tests/zones/test.com 005b3381db2a7dc70b690484f6ab7770 ../regression-tests/zones/test.dyndns 0861783f9f83acd9044278cda2528ee2 ../regression-tests/zones/wtest.com @@ -10,4 +10,5 @@ a63dc120391d9df0003f2ec4f461a6af ../regression-tests/zones/secure-delegated.dns 0b20d7a0250576451135483b863750bf ../regression-tests/zones/tsig.com b1f775045fa2cf0a3b91aa834af06e49 ../regression-tests/zones/stest.com a98864b315f16bcf49ce577426063c42 ../regression-tests/zones/cdnskey-cds-test.com -c2ce217bc4d2219f833990a76ed1a516 ../modules/tinydnsbackend/data.cdb +9aeed2c26d0c3ba3baf22dfa9568c451 ../regression-tests/zones/2.0.192.in-addr.arpa +e30afafb846e773a5bff70dcfdb52088 ../modules/tinydnsbackend/data.cdb diff --git a/regression-tests/named.conf b/regression-tests/named.conf index ce6483cb60..295565875a 100644 --- a/regression-tests/named.conf +++ b/regression-tests/named.conf @@ -69,3 +69,8 @@ zone "cdnskey-cds-test.com"{ type master; file "cdnskey-cds-test.com"; }; + +zone "2.0.192.in-addr.arpa"{ + type master; + file "2.0.192.in-addr.arpa"; +}; diff --git a/regression-tests/tests/00dnssec-grabkeys/expected_result.dnssec b/regression-tests/tests/00dnssec-grabkeys/expected_result.dnssec index f599e28b8a..b4de394767 100644 --- a/regression-tests/tests/00dnssec-grabkeys/expected_result.dnssec +++ b/regression-tests/tests/00dnssec-grabkeys/expected_result.dnssec @@ -1 +1 @@ -10 +11 diff --git a/regression-tests/tests/verify-dnssec-zone/expected_result b/regression-tests/tests/verify-dnssec-zone/expected_result index 074ec83493..8c266ea160 100644 --- a/regression-tests/tests/verify-dnssec-zone/expected_result +++ b/regression-tests/tests/verify-dnssec-zone/expected_result @@ -81,3 +81,11 @@ zone cdnskey-cds-test.com/IN: loaded serial 2005092501 (DNSSEC signed) OK RETVAL: 0 +--- ldns-verify-zone -V2 2.0.192.in-addr.arpa +RETVAL: 0 + +--- named-checkzone 2.0.192.in-addr.arpa +zone 2.0.192.in-addr.arpa/IN: loaded serial 2000081501 (DNSSEC signed) +OK +RETVAL: 0 + diff --git a/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3 b/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3 index 074ec83493..8c266ea160 100644 --- a/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3 +++ b/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3 @@ -81,3 +81,11 @@ zone cdnskey-cds-test.com/IN: loaded serial 2005092501 (DNSSEC signed) OK RETVAL: 0 +--- ldns-verify-zone -V2 2.0.192.in-addr.arpa +RETVAL: 0 + +--- named-checkzone 2.0.192.in-addr.arpa +zone 2.0.192.in-addr.arpa/IN: loaded serial 2000081501 (DNSSEC signed) +OK +RETVAL: 0 + diff --git a/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3-optout b/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3-optout index 8f41144cf9..30af77a196 100644 --- a/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3-optout +++ b/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3-optout @@ -84,3 +84,11 @@ zone cdnskey-cds-test.com/IN: loaded serial 2005092501 (DNSSEC signed) OK RETVAL: 0 +--- ldns-verify-zone -V2 2.0.192.in-addr.arpa +RETVAL: 0 + +--- named-checkzone 2.0.192.in-addr.arpa +zone 2.0.192.in-addr.arpa/IN: loaded serial 2000081501 (DNSSEC signed) +OK +RETVAL: 0 + diff --git a/regression-tests/zones/.gitignore b/regression-tests/zones/.gitignore index 6fd9d3732e..444a318bd2 100644 --- a/regression-tests/zones/.gitignore +++ b/regression-tests/zones/.gitignore @@ -2,6 +2,7 @@ /*.bind /*.com-slave /*.dyndns-slave +/2.0.192.in-addr.arpa-slave /*.signed /*.nsd /ixfr.state diff --git a/regression-tests/zones/2.0.192.in-addr.arpa b/regression-tests/zones/2.0.192.in-addr.arpa new file mode 100644 index 0000000000..e1bc263f10 --- /dev/null +++ b/regression-tests/zones/2.0.192.in-addr.arpa @@ -0,0 +1,12 @@ +$TTL 120 +$ORIGIN 2.0.192.in-addr.arpa. +@ IN SOA ns1.example.com. ahu.example.com. ( + 2000081501 + 8H ; refresh + 2H ; retry + 1W ; expire + 1D ; default_ttl + ) + +@ IN NS ns1.example.com. +@ IN NS ns2.example.com. diff --git a/regression-tests/zones/example.com b/regression-tests/zones/example.com index 11308b2275..c73d392e6c 100644 --- a/regression-tests/zones/example.com +++ b/regression-tests/zones/example.com @@ -20190,4 +20190,6 @@ host-1 IN EUI64 00-50-56-9b-00-e7-7e-57 ; rhs-at-expansion IN CNAME @ ; -google-alias IN ALIAS google-public-dns-a.google.com. \ No newline at end of file +google-alias IN ALIAS google-public-dns-a.google.com. +; +host-for-auto-ptr IN A 192.0.2.1