From 66f5d6dc2a3856a67cb8912c4d94767b01271e62 Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Wed, 4 Dec 2013 19:28:45 +0100 Subject: [PATCH] add DS at both sides of zone-cut test --- modules/tinydnsbackend/data | 1 + modules/tinydnsbackend/data.cdb | Bin 1350577 -> 1350681 bytes .../tinydns-data-check/expected_result | 4 ++-- regression-tests/delegated.dnssec-parent.com | 2 +- regression-tests/ds-at-both-sides/command | 3 +++ regression-tests/ds-at-both-sides/description | 2 ++ .../ds-at-both-sides/expected_result | 5 +++++ .../ds-at-both-sides/skip.nodnssec | 0 8 files changed, 14 insertions(+), 3 deletions(-) create mode 100755 regression-tests/ds-at-both-sides/command create mode 100644 regression-tests/ds-at-both-sides/description create mode 100644 regression-tests/ds-at-both-sides/expected_result create mode 100644 regression-tests/ds-at-both-sides/skip.nodnssec diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data index 6ea9813a21..c06e291469 100644 --- a/modules/tinydnsbackend/data +++ b/modules/tinydnsbackend/data @@ -20244,6 +20244,7 @@ Zdelegated.dnssec-parent.com:ns1.delegated.dnssec-parent.com.:ahu.example.com.:2 +delegated.dnssec-parent.com:9.9.9.9:3600 &delegated.dnssec-parent.com::ns1.delegated.dnssec-parent.com.:3600 &delegated.dnssec-parent.com::ns2.delegated.dnssec-parent.com.:3600 +:delegated.dnssec-parent.com:43:\253\376\010\002\324\303\325U\053\206y\372\356\2741\176\137\004\213aK.\137\140\175\305\177\025S\030-I\253\041y\367:3600 +ns1.delegated.dnssec-parent.com:4.5.6.7:3600 +ns2.delegated.dnssec-parent.com:5.6.7.8:3600 Cwww.delegated.dnssec-parent.com:delegated.dnssec-parent.com.:3600 diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb index 2f990da0f7f91700354a036fd0d18eac031e3f82..e9deacee8a94e80d87c677cd440abdab4bbe7df8 100644 GIT binary patch delta 3132 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 diff --git a/regression-tests.nobackend/tinydns-data-check/expected_result b/regression-tests.nobackend/tinydns-data-check/expected_result index e1ae22d454..ae1ccf6bf2 100644 --- a/regression-tests.nobackend/tinydns-data-check/expected_result +++ b/regression-tests.nobackend/tinydns-data-check/expected_result @@ -4,9 +4,9 @@ 21213b4e8cd56e4184696a1bafd987d7 ../regression-tests/wtest.com 42b442de632686e94bde75acf66cf524 ../regression-tests/nztest.com 6e4ac6e3a6cd717df107a7bc2e466ac7 ../regression-tests/dnssec-parent.com -42dd3a56c7d268e75836371878819ec4 ../regression-tests/delegated.dnssec-parent.com +6510bf48aa3ca3501b73a1f510852a34 ../regression-tests/delegated.dnssec-parent.com a63dc120391d9df0003f2ec4f461a6af ../regression-tests/secure-delegated.dnssec-parent.com 24514dc104b22206daeb973ff9303545 ../regression-tests/minimal.com 0b20d7a0250576451135483b863750bf ../regression-tests/tsig.com b1f775045fa2cf0a3b91aa834af06e49 ../regression-tests/stest.com -2e24a38e3e23ce40da06f41417f91c42 ../modules/tinydnsbackend/data.cdb +80927ffb754402270483d06c0ebeaaad ../modules/tinydnsbackend/data.cdb diff --git a/regression-tests/delegated.dnssec-parent.com b/regression-tests/delegated.dnssec-parent.com index d852053375..bb2adbc3d4 100644 --- a/regression-tests/delegated.dnssec-parent.com +++ b/regression-tests/delegated.dnssec-parent.com @@ -10,7 +10,7 @@ $ORIGIN delegated.dnssec-parent.com. @ IN NS ns1 @ IN NS ns2 @ IN A 9.9.9.9 +@ IN DS 44030 8 2 D4C3D5552B8679FAEEBC317E5F048B614B2E5F607DC57F1553182D49AB2179F7 ns1 IN A 4.5.6.7 ns2 IN A 5.6.7.8 www IN CNAME @ - diff --git a/regression-tests/ds-at-both-sides/command b/regression-tests/ds-at-both-sides/command new file mode 100755 index 0000000000..4d8bb67915 --- /dev/null +++ b/regression-tests/ds-at-both-sides/command @@ -0,0 +1,3 @@ +#!/bin/sh +cleandig secure-delegated.dnssec-parent.com DS dnssec showflags + diff --git a/regression-tests/ds-at-both-sides/description b/regression-tests/ds-at-both-sides/description new file mode 100644 index 0000000000..7e9864e468 --- /dev/null +++ b/regression-tests/ds-at-both-sides/description @@ -0,0 +1,2 @@ +Make sure we return the parent DS if there is a DS at both sides +of the zone-cut. diff --git a/regression-tests/ds-at-both-sides/expected_result b/regression-tests/ds-at-both-sides/expected_result new file mode 100644 index 0000000000..beeba463ac --- /dev/null +++ b/regression-tests/ds-at-both-sides/expected_result @@ -0,0 +1,5 @@ +0 secure-delegated.dnssec-parent.com. IN DS 3600 54319 8 2 a0b9c38cd324182af0ef66830d0a0e85a1d58979c9834e18c871779e040857b7 +0 secure-delegated.dnssec-parent.com. IN RRSIG 3600 DS 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +2 . IN OPT 32768 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='secure-delegated.dnssec-parent.com.', qtype=DS diff --git a/regression-tests/ds-at-both-sides/skip.nodnssec b/regression-tests/ds-at-both-sides/skip.nodnssec new file mode 100644 index 0000000000..e69de29bb2 -- 2.47.2