test NS and CNAME pointing at the root

diff --git a/regression-tests.nobackend/tinydns-data-check/expected_result b/regression-tests.nobackend/tinydns-data-check/expected_result
index 36c5fbb4e08d623bb77ef2773961351e1751b208..e71c4cfb12ef06288f9263a1fc8ed1233571b2f4 100644 (file)
--- a/regression-tests.nobackend/tinydns-data-check/expected_result
+++ b/regression-tests.nobackend/tinydns-data-check/expected_result
@@ -1,7 +1,7 @@
 4bc48a8d9b8d04b553be67639e5656e8  ../regression-tests/zones/example.com
-38f421f6dd6c842f6f4f8a5a996cdb7d  ../regression-tests/zones/test.com
+c5d5a2a68d72760b5f6f563eb0a1b6d5  ../regression-tests/zones/test.com
 005b3381db2a7dc70b690484f6ab7770  ../regression-tests/zones/test.dyndns
-21213b4e8cd56e4184696a1bafd987d7  ../regression-tests/zones/wtest.com
+0861783f9f83acd9044278cda2528ee2  ../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

diff --git a/regression-tests/tests/ent-axfr/expected_result b/regression-tests/tests/ent-axfr/expected_result
index 20c4e73d677a6eeb850646076ed27e5fc0f2273c..54d8943fa1d910c18048fb1f766671fa22209670 100644 (file)
--- a/regression-tests/tests/ent-axfr/expected_result
+++ b/regression-tests/tests/ent-axfr/expected_result
@@ -16,7 +16,8 @@ ns2.test.com. 86400   IN      NSEC    server1.test.com. A RRSIG NSEC
 server1.test.com.      86400   IN      NSEC    *.test.test.com. A RP RRSIG NSEC
 sub.test.test.com.     86400   IN      NSEC    www.test.test.com. NS RRSIG NSEC
 test.com.      86400   IN      NSEC    _underscore.test.com. NS SOA MX RRSIG NSEC DNSKEY
+toroot.test.com.       86400   IN      NSEC    very-long-txt.test.com. CNAME RRSIG NSEC
 very-long-txt.test.com.        86400   IN      NSEC    within-server.test.com. TXT RRSIG NSEC
 within-server.test.com.        86400   IN      NSEC    www.test.com. CNAME RRSIG NSEC
 www.test.com.  86400   IN      NSEC    test.com. CNAME RRSIG NSEC
-www.test.test.com.     86400   IN      NSEC    very-long-txt.test.com. A RRSIG NSEC
+www.test.test.com.     86400   IN      NSEC    toroot.test.com. A RRSIG NSEC

diff --git a/regression-tests/tests/ent-axfr/expected_result.nsec3 b/regression-tests/tests/ent-axfr/expected_result.nsec3
index 82e2ba1a9010487209f1956db3323cfe9effb154..7e04311cc2dff0d0b9e15aae5ff175592425c3c8 100644 (file)
--- a/regression-tests/tests/ent-axfr/expected_result.nsec3
+++ b/regression-tests/tests/ent-axfr/expected_result.nsec3
@@ -15,7 +15,8 @@ de592k86u3hevdj57jpbt7j5kv7doo78.test.com.    86400   IN      NSEC3   1 0 1 abcd EBAN51BJGUG
 eban51bjgugorb20unp5peec7s5d2eka.test.com.     86400   IN      NSEC3   1 0 1 abcd H5855RVON2AASM8QV1NK49I1B2MKBEJP SRV RRSIG
 h5855rvon2aasm8qv1nk49i1b2mkbejp.test.com.     86400   IN      NSEC3   1 0 1 abcd IAI9HIN25MEH689R5V5GTIFK8OM5DI0E A RRSIG
 iai9hin25meh689r5v5gtifk8om5di0e.test.com.     86400   IN      NSEC3   1 0 1 abcd IGF4M7OTECACH14P0A6INGI7DBUAS5B2 A RRSIG
-igf4m7otecach14p0a6ingi7dbuas5b2.test.com.     86400   IN      NSEC3   1 0 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 A RP RRSIG
+igf4m7otecach14p0a6ingi7dbuas5b2.test.com.     86400   IN      NSEC3   1 0 1 abcd N5RSKFSBG0UK5SSPJ595R6546HKK5VK1 A RP RRSIG
+n5rskfsbg0uk5sspj595r6546hkk5vk1.test.com.     86400   IN      NSEC3   1 0 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 CNAME RRSIG
 o1l0fb73hi3qp4a3fnqjsleanlc883i3.test.com.     86400   IN      NSEC3   1 0 1 abcd PLUD9QQECURIL62GCFP8BR44I7EOQ7C9 TXT RRSIG
 plud9qqecuril62gcfp8br44i7eoq7c9.test.com.     86400   IN      NSEC3   1 0 1 abcd QD81AG9INQTS1OCS7API0PJI94K27BTR SRV RRSIG
 qd81ag9inqts1ocs7api0pji94k27btr.test.com.     86400   IN      NSEC3   1 0 1 abcd S6G5SHC1JVOVL5FL9E943ADLONQLN7G4 CNAME RRSIG

diff --git a/regression-tests/tests/ent-axfr/expected_result.nsec3-optout b/regression-tests/tests/ent-axfr/expected_result.nsec3-optout
index adc712a361741be0da43ace6048d6bcc5b2e70fd..dd5f317073b8b0bcd6822ccfc2bf9722839ce0ea 100644 (file)
--- a/regression-tests/tests/ent-axfr/expected_result.nsec3-optout
+++ b/regression-tests/tests/ent-axfr/expected_result.nsec3-optout
@@ -14,7 +14,8 @@ dafc69cv5n2tfcf6ovbvtv94drgmqjo5.test.com.    86400   IN      NSEC3   1 1 1 abcd EBAN51BJGUG
 eban51bjgugorb20unp5peec7s5d2eka.test.com.     86400   IN      NSEC3   1 1 1 abcd H5855RVON2AASM8QV1NK49I1B2MKBEJP SRV RRSIG
 h5855rvon2aasm8qv1nk49i1b2mkbejp.test.com.     86400   IN      NSEC3   1 1 1 abcd IAI9HIN25MEH689R5V5GTIFK8OM5DI0E A RRSIG
 iai9hin25meh689r5v5gtifk8om5di0e.test.com.     86400   IN      NSEC3   1 1 1 abcd IGF4M7OTECACH14P0A6INGI7DBUAS5B2 A RRSIG
-igf4m7otecach14p0a6ingi7dbuas5b2.test.com.     86400   IN      NSEC3   1 1 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 A RP RRSIG
+igf4m7otecach14p0a6ingi7dbuas5b2.test.com.     86400   IN      NSEC3   1 1 1 abcd N5RSKFSBG0UK5SSPJ595R6546HKK5VK1 A RP RRSIG
+n5rskfsbg0uk5sspj595r6546hkk5vk1.test.com.     86400   IN      NSEC3   1 1 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 CNAME RRSIG
 o1l0fb73hi3qp4a3fnqjsleanlc883i3.test.com.     86400   IN      NSEC3   1 1 1 abcd PLUD9QQECURIL62GCFP8BR44I7EOQ7C9 TXT RRSIG
 plud9qqecuril62gcfp8br44i7eoq7c9.test.com.     86400   IN      NSEC3   1 1 1 abcd QD81AG9INQTS1OCS7API0PJI94K27BTR SRV RRSIG
 qd81ag9inqts1ocs7api0pji94k27btr.test.com.     86400   IN      NSEC3   1 1 1 abcd S6G5SHC1JVOVL5FL9E943ADLONQLN7G4 CNAME RRSIG

diff --git a/regression-tests/tests/root-cname/command b/regression-tests/tests/root-cname/command
new file mode 100755 (executable)
index 0000000..5f9815a
--- /dev/null
+++ b/regression-tests/tests/root-cname/command
@@ -0,0 +1,3 @@
+#!/bin/sh
+cleandig toroot.test.com CNAME
+

diff --git a/regression-tests/tests/root-cname/description b/regression-tests/tests/root-cname/description
new file mode 100644 (file)
index 0000000..ab8cf4d
--- /dev/null
+++ b/regression-tests/tests/root-cname/description
@@ -0,0 +1 @@
+This test makes sure an CNAME record pointing at the root works

diff --git a/regression-tests/tests/root-cname/expected_result b/regression-tests/tests/root-cname/expected_result
new file mode 100644 (file)
index 0000000..e4413b5
--- /dev/null
+++ b/regression-tests/tests/root-cname/expected_result
@@ -0,0 +1,3 @@
+0      toroot.test.com.        IN      CNAME   3600    .
+Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Reply to question for qname='toroot.test.com.', qtype=CNAME

diff --git a/regression-tests/tests/root-ns/command b/regression-tests/tests/root-ns/command
new file mode 100755 (executable)
index 0000000..8f29456
--- /dev/null
+++ b/regression-tests/tests/root-ns/command
@@ -0,0 +1,2 @@
+#!/bin/sh
+cleandig wtest.com NS

diff --git a/regression-tests/tests/root-ns/description b/regression-tests/tests/root-ns/description
new file mode 100644 (file)
index 0000000..5c4c86f
--- /dev/null
+++ b/regression-tests/tests/root-ns/description
@@ -0,0 +1 @@
+This test makes sure an NS record pointing at the root works

diff --git a/regression-tests/tests/root-ns/expected_result b/regression-tests/tests/root-ns/expected_result
new file mode 100644 (file)
index 0000000..4fbe9b7
--- /dev/null
+++ b/regression-tests/tests/root-ns/expected_result
@@ -0,0 +1,5 @@
+0      wtest.com.      IN      NS      3600    .
+0      wtest.com.      IN      NS      3600    ns1.wtest.com.
+2      ns1.wtest.com.  IN      A       3600    2.3.4.5
+Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Reply to question for qname='wtest.com.', qtype=NS

diff --git a/regression-tests/zones/test.com b/regression-tests/zones/test.com
index 818e1ff0a65917e229b198656e9e541b8b1a6490..2ae567928b1d0c225a71a67cc8836412c2f32344 100644 (file)
--- a/regression-tests/zones/test.com
+++ b/regression-tests/zones/test.com
@@ -13,6 +13,7 @@ $ORIGIN test.com.
 @                      IN      MX      15      smtp-servers
 ns1                    IN      A       1.1.1.1
 ns2                    IN      A       2.2.2.2
+toroot                 IN      CNAME   .
 www                    IN      CNAME   server1
 server1                        IN      A       1.2.3.4
                        IN      RP      ahu.ds9a.nl. counter

diff --git a/regression-tests/zones/wtest.com b/regression-tests/zones/wtest.com
index 7049fefc63d08a5febdcf1abe279f1ce4c184f86..e95ab8bbe1b4df4e636de60fee50da99bd746e3e 100644 (file)
--- a/regression-tests/zones/wtest.com
+++ b/regression-tests/zones/wtest.com
@@ -7,13 +7,12 @@ $ORIGIN wtest.com.
                        1D ; default_ttl
                        )
 
+@                      IN      NS      .
 @                      IN      NS      ns1
-@                      IN      NS      ns2
 @                      IN      MX      10      smtp-servers.example.com.
 @                      IN      MX      15      smtp-servers
 @                      IN      A       9.9.9.9
 ns1                    IN      A       2.3.4.5
-ns2                    IN      A       5.6.7.8
 *                      IN      CNAME   server1
 secure                 IN      MX      10 server1
 server1                        IN      A       1.2.3.4