From: Kees Monshouwer <mind04@monshouwer.org>
Date: Wed, 4 Dec 2013 18:28:45 +0000 (+0100)
Subject: add DS at both sides of zone-cut test
X-Git-Tag: rec-3.6.0-rc1~314^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1153%2Fhead;p=thirdparty%2Fpdns.git

add DS at both sides of zone-cut test
---

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 2f990da0f7..e9deacee8a 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 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