From b8fab41f7d82678cee8c5e6f6a735b66b70c146a Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Mon, 18 Dec 2017 16:49:45 +0100 Subject: [PATCH] remove fake ENTs --- modules/tinydnsbackend/data | 6 ------ modules/tinydnsbackend/data.cdb | Bin 1352206 -> 1351781 bytes .../tinydns-data-check/expected_result | 4 ++-- .../nsec-wildcard/expected_result.narrow | 2 +- .../tests/nsec-wildcard/expected_result.nsec3 | 2 +- .../expected_result.narrow | 2 +- .../expected_result.nsec3 | 2 +- regression-tests/zones/wtest.com | 6 ------ 8 files changed, 6 insertions(+), 18 deletions(-) diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data index 78e555f4f9..74154f9e6e 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 40206e6c4a9e79bc09d4649b6f6ba16cc0daf668..9cb500fb4ddfefcd41d44fa6e0d0f5635c03fc2a 100644 GIT binary patch delta 7182 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 H3@!RUOxk=j delta 7539 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 NYZOr|gk*87