From: Peter van Dijk Date: Mon, 18 Dec 2017 15:49:45 +0000 (+0100) Subject: remove fake ENTs X-Git-Tag: dnsdist-1.3.0~181^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8fab41f7d82678cee8c5e6f6a735b66b70c146a;p=pdns remove fake ENTs --- diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data index 78e555f4f..74154f9e6 100644 --- a/modules/tinydnsbackend/data +++ b/modules/tinydnsbackend/data @@ -20213,12 +20213,6 @@ Ztest.dyndns:ns1.test.dyndns.:ahu.example.dyndns.:2012060701:28800:7200:604800:8 +ns1.wtest.com:2.3.4.5:3600 +server1.wtest.com:1.2.3.4:3600 +wtest.com:9.9.9.9:3600 -:a.b.c.d.e.wtest.com:16:\011non-empty:3600 -:b.c.d.e.wtest.com:16:\011non-empty:3600 -:c.d.e.wtest.com:16:\011non-empty:3600 -:d.e.wtest.com:16:\011non-empty:3600 -:e.wtest.com:16:\011non-empty:3600 -:something.wtest.com:16:\045make\040the\040empty\040non-terminal\040non-empty:3600 @secure.wtest.com::server1.wtest.com.:10:3600 @wtest.com::smtp-servers.example.com.:10:3600 @wtest.com::smtp-servers.wtest.com.:15:3600 diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb index 40206e6c4..9cb500fb4 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 479c24316..f83c04338 100644 --- a/regression-tests.nobackend/tinydns-data-check/expected_result +++ b/regression-tests.nobackend/tinydns-data-check/expected_result @@ -1,7 +1,7 @@ 17a1219ca79020c1c67ad173a291d3c8 ../regression-tests/zones/example.com fe49d2784b1bcc3b91ddd5619f0b6cc1 ../regression-tests/zones/test.com 005b3381db2a7dc70b690484f6ab7770 ../regression-tests/zones/test.dyndns -0861783f9f83acd9044278cda2528ee2 ../regression-tests/zones/wtest.com +e7c0fd528e8aaedb1ea3b6daaead4de2 ../regression-tests/zones/wtest.com 42b442de632686e94bde75acf66cf524 ../regression-tests/zones/nztest.com aeff58ea1eb6e63096e6da18337be312 ../regression-tests/zones/dnssec-parent.com 6510bf48aa3ca3501b73a1f510852a34 ../regression-tests/zones/delegated.dnssec-parent.com @@ -11,4 +11,4 @@ a63dc120391d9df0003f2ec4f461a6af ../regression-tests/zones/secure-delegated.dns b1f775045fa2cf0a3b91aa834af06e49 ../regression-tests/zones/stest.com a98864b315f16bcf49ce577426063c42 ../regression-tests/zones/cdnskey-cds-test.com 9aeed2c26d0c3ba3baf22dfa9568c451 ../regression-tests/zones/2.0.192.in-addr.arpa -e30afafb846e773a5bff70dcfdb52088 ../modules/tinydnsbackend/data.cdb +fedfd1e91ef52143c9b3430925bd3881 ../modules/tinydnsbackend/data.cdb diff --git a/regression-tests/tests/nsec-wildcard/expected_result.narrow b/regression-tests/tests/nsec-wildcard/expected_result.narrow index d57cdf157..5605b0d31 100644 --- a/regression-tests/tests/nsec-wildcard/expected_result.narrow +++ b/regression-tests/tests/nsec-wildcard/expected_result.narrow @@ -1,6 +1,6 @@ 1 368r0s1q794jmkdrcpf6f85v316hd9ak.wtest.com. IN NSEC3 86400 1 [flags] 1 abcd 368R0S1Q794JMKDRCPF6F85V316HD9AM 1 368r0s1q794jmkdrcpf6f85v316hd9ak.wtest.com. IN RRSIG 86400 NSEC3 13 3 86400 [expiry] [inception] [keytag] wtest.com. ... -1 54njs65s8u96tkffrft6l7j1t1556vik.wtest.com. IN NSEC3 86400 1 [flags] 1 abcd 54NJS65S8U96TKFFRFT6L7J1T1556VIL TXT RRSIG +1 54njs65s8u96tkffrft6l7j1t1556vik.wtest.com. IN NSEC3 86400 1 [flags] 1 abcd 54NJS65S8U96TKFFRFT6L7J1T1556VIL 1 54njs65s8u96tkffrft6l7j1t1556vik.wtest.com. IN RRSIG 86400 NSEC3 13 3 86400 [expiry] [inception] [keytag] wtest.com. ... 1 pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com. IN NSEC3 86400 1 [flags] 1 abcd PD15QDSJJBFOSU5FG2OQRNLB8R8OIFL7 A RRSIG 1 pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com. IN RRSIG 86400 NSEC3 13 3 86400 [expiry] [inception] [keytag] wtest.com. ... diff --git a/regression-tests/tests/nsec-wildcard/expected_result.nsec3 b/regression-tests/tests/nsec-wildcard/expected_result.nsec3 index 1af0b3825..4fddb4b27 100644 --- a/regression-tests/tests/nsec-wildcard/expected_result.nsec3 +++ b/regression-tests/tests/nsec-wildcard/expected_result.nsec3 @@ -1,6 +1,6 @@ 1 2uspqp0ldid6481h33c7lakfkk2g2rdq.wtest.com. IN NSEC3 86400 1 [flags] 1 abcd 53I5J7TGM8QG2GBV716RVQVARQCIJUE2 A RRSIG 1 2uspqp0ldid6481h33c7lakfkk2g2rdq.wtest.com. IN RRSIG 86400 NSEC3 13 3 86400 [expiry] [inception] [keytag] wtest.com. ... -1 54njs65s8u96tkffrft6l7j1t1556vik.wtest.com. IN NSEC3 86400 1 [flags] 1 abcd 67I2ESLUBOJ7DPG4263L3T8DV19G6D0G TXT RRSIG +1 54njs65s8u96tkffrft6l7j1t1556vik.wtest.com. IN NSEC3 86400 1 [flags] 1 abcd 67I2ESLUBOJ7DPG4263L3T8DV19G6D0G 1 54njs65s8u96tkffrft6l7j1t1556vik.wtest.com. IN RRSIG 86400 NSEC3 13 3 86400 [expiry] [inception] [keytag] wtest.com. ... 1 pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com. IN NSEC3 86400 1 [flags] 1 abcd SHEGK154N8362AG22AR9VDDRF3127M6I A RRSIG 1 pd15qdsjjbfosu5fg2oqrnlb8r8oifl6.wtest.com. IN RRSIG 86400 NSEC3 13 3 86400 [expiry] [inception] [keytag] wtest.com. ... diff --git a/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.narrow b/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.narrow index 4b41de68a..3c28abb9f 100644 --- a/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.narrow +++ b/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.narrow @@ -1,4 +1,4 @@ -1 54njs65s8u96tkffrft6l7j1t1556vik.wtest.com. IN NSEC3 86400 1 [flags] 1 abcd 54NJS65S8U96TKFFRFT6L7J1T1556VIL TXT RRSIG +1 54njs65s8u96tkffrft6l7j1t1556vik.wtest.com. IN NSEC3 86400 1 [flags] 1 abcd 54NJS65S8U96TKFFRFT6L7J1T1556VIL 1 54njs65s8u96tkffrft6l7j1t1556vik.wtest.com. IN RRSIG 86400 NSEC3 13 3 86400 [expiry] [inception] [keytag] wtest.com. ... 1 d0rjlf3tful8jfjk86vi5ce50nuea9a6.wtest.com. IN NSEC3 86400 1 [flags] 1 abcd D0RJLF3TFUL8JFJK86VI5CE50NUEA9A8 1 d0rjlf3tful8jfjk86vi5ce50nuea9a6.wtest.com. IN RRSIG 86400 NSEC3 13 3 86400 [expiry] [inception] [keytag] wtest.com. ... diff --git a/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.nsec3 b/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.nsec3 index 611b7bca1..800ed55f0 100644 --- a/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.nsec3 +++ b/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.nsec3 @@ -1,4 +1,4 @@ -1 54njs65s8u96tkffrft6l7j1t1556vik.wtest.com. IN NSEC3 86400 1 [flags] 1 abcd 67I2ESLUBOJ7DPG4263L3T8DV19G6D0G TXT RRSIG +1 54njs65s8u96tkffrft6l7j1t1556vik.wtest.com. IN NSEC3 86400 1 [flags] 1 abcd 67I2ESLUBOJ7DPG4263L3T8DV19G6D0G 1 54njs65s8u96tkffrft6l7j1t1556vik.wtest.com. IN RRSIG 86400 NSEC3 13 3 86400 [expiry] [inception] [keytag] wtest.com. ... 1 cv382m4jqhle9u45mdqfh64vp0jbfpn5.wtest.com. IN NSEC3 86400 1 [flags] 1 abcd J02K7MH36PLGFKRS6UTOCESCCQ5P7EOB A RRSIG 1 cv382m4jqhle9u45mdqfh64vp0jbfpn5.wtest.com. IN RRSIG 86400 NSEC3 13 3 86400 [expiry] [inception] [keytag] wtest.com. ... diff --git a/regression-tests/zones/wtest.com b/regression-tests/zones/wtest.com index e95ab8bbe..9dc5bc3e1 100644 --- a/regression-tests/zones/wtest.com +++ b/regression-tests/zones/wtest.com @@ -16,12 +16,6 @@ ns1 IN A 2.3.4.5 * IN CNAME server1 secure IN MX 10 server1 server1 IN A 1.2.3.4 -something IN TXT "make the empty non-terminal non-empty" *.something IN A 4.3.2.1 *.a.b.c.d.e IN A 6.7.8.9 -e IN TXT "non-empty" -d.e IN TXT "non-empty" -c.d.e IN TXT "non-empty" -b.c.d.e IN TXT "non-empty" -a.b.c.d.e IN TXT "non-empty" a.something IN A 10.11.12.13