add additional levels of ents (auth and unauth) to the insecure delegation ent test

diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data
index a324e7728f619a88431dae4bd0303449a5b95668..403966b6ea890b3fedd090bcc928cc964f3cc7b0 100644 (file)
--- a/modules/tinydnsbackend/data
+++ b/modules/tinydnsbackend/data
@@ -20228,11 +20228,12 @@ Zdnssec-parent.com:ns1.dnssec-parent.com.:ahu.example.com.:2005092501:28800:7200
 +dnssec-parent.com:9.9.9.9:3600
 &dnssec-parent.com::ns1.dnssec-parent.com.:3600
 &dnssec-parent.com::ns2.dnssec-parent.com.:3600
+&insecure-delegated.ent.ent.auth-ent.dnssec-parent.com::ns.example.com.:3600
++something1.auth-ent.dnssec-parent.com:1.1.2.3:3600
 &delegated.dnssec-parent.com::ns1.delegated.dnssec-parent.com.:3600
 &delegated.dnssec-parent.com::ns2.delegated.dnssec-parent.com.:3600
 +ns1.delegated.dnssec-parent.com:4.5.6.7:3600
 +ns2.delegated.dnssec-parent.com:5.6.7.8:3600
-&insecure-delegated.ent.dnssec-parent.com::ns.example.com.:3600
 +ns1.dnssec-parent.com:1.2.3.4:3600
 +ns2.dnssec-parent.com:4.3.2.1:3600
 &secure-delegated.dnssec-parent.com::ns1.secure-delegated.dnssec-parent.com.:3600

diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb
index e258c3d33b272b6dec5779f8e474813c8db2d10f..916e491a575051833a450b76a45ed69ab4ab4ce6 100644 (file)
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 ceddb4d79faa958be3052cb51884102d1fb7215b..894b69837cd16c3351ad796eab0aed9fbcd6f91d 100644 (file)
--- a/regression-tests.nobackend/tinydns-data-check/expected_result
+++ b/regression-tests.nobackend/tinydns-data-check/expected_result
@@ -3,10 +3,10 @@
 005b3381db2a7dc70b690484f6ab7770  ../regression-tests/zones/test.dyndns
 21213b4e8cd56e4184696a1bafd987d7  ../regression-tests/zones/wtest.com
 42b442de632686e94bde75acf66cf524  ../regression-tests/zones/nztest.com
-e7d974086e9b73dda2656cb043e90de4  ../regression-tests/zones/dnssec-parent.com
+aeff58ea1eb6e63096e6da18337be312  ../regression-tests/zones/dnssec-parent.com
 6510bf48aa3ca3501b73a1f510852a34  ../regression-tests/zones/delegated.dnssec-parent.com
 a63dc120391d9df0003f2ec4f461a6af  ../regression-tests/zones/secure-delegated.dnssec-parent.com
 24514dc104b22206daeb973ff9303545  ../regression-tests/zones/minimal.com
 0b20d7a0250576451135483b863750bf  ../regression-tests/zones/tsig.com
 b1f775045fa2cf0a3b91aa834af06e49  ../regression-tests/zones/stest.com
-c21e01a6158f03732c911fe22f4ce1db  ../modules/tinydnsbackend/data.cdb
+a691ba21cde91f1b9f3cc92c7a078636  ../modules/tinydnsbackend/data.cdb

diff --git a/regression-tests/tests/axfr/expected_result b/regression-tests/tests/axfr/expected_result
index e7cdf273fe41d77d3691d2f7119ca3640569d7e5..09a97393cca99dba08d3e250546830b6e39a2434 100644 (file)
--- a/regression-tests/tests/axfr/expected_result
+++ b/regression-tests/tests/axfr/expected_result
@@ -5,7 +5,7 @@ dnssec-parent.com.      IN      NS      3600    ns1.dnssec-parent.com.
 dnssec-parent.com.     IN      NS      3600    ns2.dnssec-parent.com.
 dnssec-parent.com.     IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 dnssec-parent.com.     IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-insecure-delegated.ent.dnssec-parent.com.      IN      NS      3600    ns.example.com.
+insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. IN      NS      3600    ns.example.com.
 ns1.delegated.dnssec-parent.com.       IN      A       3600    4.5.6.7
 ns1.dnssec-parent.com. IN      A       3600    1.2.3.4
 ns1.secure-delegated.dnssec-parent.com.        IN      A       3600    1.2.3.4
@@ -15,3 +15,4 @@ ns2.secure-delegated.dnssec-parent.com.       IN      A       3600    5.6.7.8
 secure-delegated.dnssec-parent.com.    IN      DS      3600    54319 8 2 a0b9c38cd324182af0ef66830d0a0e85a1d58979c9834e18c871779e040857b7
 secure-delegated.dnssec-parent.com.    IN      NS      3600    ns1.secure-delegated.dnssec-parent.com.
 secure-delegated.dnssec-parent.com.    IN      NS      3600    ns2.secure-delegated.dnssec-parent.com.
+something1.auth-ent.dnssec-parent.com. IN      A       3600    1.1.2.3

diff --git a/regression-tests/tests/axfr/expected_result.dnssec b/regression-tests/tests/axfr/expected_result.dnssec
index a1373742db9a7fadb1b826cc44cf1c563f2f4454..95536a90eba851d4adcd413c812cbb86e7bac9c4 100644 (file)
--- a/regression-tests/tests/axfr/expected_result.dnssec
+++ b/regression-tests/tests/axfr/expected_result.dnssec
@@ -1,13 +1,13 @@
 delegated.dnssec-parent.com.   IN      NS      3600    ns1.delegated.dnssec-parent.com.
 delegated.dnssec-parent.com.   IN      NS      3600    ns2.delegated.dnssec-parent.com.
-delegated.dnssec-parent.com.   IN      NSEC    86400   insecure-delegated.ent.dnssec-parent.com. NS RRSIG NSEC
+delegated.dnssec-parent.com.   IN      NSEC    86400   ns1.dnssec-parent.com. NS RRSIG NSEC
 delegated.dnssec-parent.com.   IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 dnssec-parent.com.     IN      A       3600    9.9.9.9
 dnssec-parent.com.     IN      DNSKEY  86400   256 3 8 ...
 dnssec-parent.com.     IN      DNSKEY  86400   257 3 8 ...
 dnssec-parent.com.     IN      NS      3600    ns1.dnssec-parent.com.
 dnssec-parent.com.     IN      NS      3600    ns2.dnssec-parent.com.
-dnssec-parent.com.     IN      NSEC    86400   delegated.dnssec-parent.com. A NS SOA RRSIG NSEC DNSKEY
+dnssec-parent.com.     IN      NSEC    86400   insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. A NS SOA RRSIG NSEC DNSKEY
 dnssec-parent.com.     IN      RRSIG   3600    A 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
 dnssec-parent.com.     IN      RRSIG   3600    NS 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
 dnssec-parent.com.     IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
@@ -15,9 +15,9 @@ dnssec-parent.com.    IN      RRSIG   86400   DNSKEY 8 2 86400 [expiry] [inception] [keytag]
 dnssec-parent.com.     IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 dnssec-parent.com.     IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 dnssec-parent.com.     IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-insecure-delegated.ent.dnssec-parent.com.      IN      NS      3600    ns.example.com.
-insecure-delegated.ent.dnssec-parent.com.      IN      NSEC    86400   ns1.dnssec-parent.com. NS RRSIG NSEC
-insecure-delegated.ent.dnssec-parent.com.      IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. IN      NS      3600    ns.example.com.
+insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. IN      NSEC    86400   something1.auth-ent.dnssec-parent.com. NS RRSIG NSEC
+insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. IN      RRSIG   86400   NSEC 8 6 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 ns1.delegated.dnssec-parent.com.       IN      A       3600    4.5.6.7
 ns1.dnssec-parent.com. IN      A       3600    1.2.3.4
 ns1.dnssec-parent.com. IN      NSEC    86400   ns2.dnssec-parent.com. A RRSIG NSEC
@@ -36,3 +36,7 @@ secure-delegated.dnssec-parent.com.   IN      NS      3600    ns2.secure-delegated.dnssec-paren
 secure-delegated.dnssec-parent.com.    IN      NSEC    86400   dnssec-parent.com. NS DS RRSIG NSEC
 secure-delegated.dnssec-parent.com.    IN      RRSIG   3600    DS 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
 secure-delegated.dnssec-parent.com.    IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+something1.auth-ent.dnssec-parent.com. IN      A       3600    1.1.2.3
+something1.auth-ent.dnssec-parent.com. IN      NSEC    86400   delegated.dnssec-parent.com. A RRSIG NSEC
+something1.auth-ent.dnssec-parent.com. IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+something1.auth-ent.dnssec-parent.com. IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...

diff --git a/regression-tests/tests/axfr/expected_result.nsec3 b/regression-tests/tests/axfr/expected_result.nsec3
index 9e6017549a89d37e8c07d2babf2621d68dfc7ab9..2e61e4425fb985175cddb1d102e74e3779e33680 100644 (file)
--- a/regression-tests/tests/axfr/expected_result.nsec3
+++ b/regression-tests/tests/axfr/expected_result.nsec3
@@ -1,3 +1,5 @@
+auth-ent.dnssec-parent.com.    IN      NSEC3   86400   1 0 1 abcd [next owner]
+auth-ent.dnssec-parent.com.    IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 delegated.dnssec-parent.com.   IN      NS      3600    ns1.delegated.dnssec-parent.com.
 delegated.dnssec-parent.com.   IN      NS      3600    ns2.delegated.dnssec-parent.com.
 delegated.dnssec-parent.com.   IN      NSEC3   86400   1 0 1 abcd [next owner] NS
@@ -17,11 +19,13 @@ dnssec-parent.com.  IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag]
 dnssec-parent.com.     IN      RRSIG   86400   NSEC3PARAM 8 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 dnssec-parent.com.     IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 dnssec-parent.com.     IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-ent.dnssec-parent.com. IN      NSEC3   86400   1 0 1 abcd [next owner]
-ent.dnssec-parent.com. IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
-insecure-delegated.ent.dnssec-parent.com.      IN      NS      3600    ns.example.com.
-insecure-delegated.ent.dnssec-parent.com.      IN      NSEC3   86400   1 0 1 abcd [next owner] NS
-insecure-delegated.ent.dnssec-parent.com.      IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+ent.auth-ent.dnssec-parent.com.        IN      NSEC3   86400   1 0 1 abcd [next owner]
+ent.auth-ent.dnssec-parent.com.        IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+ent.ent.auth-ent.dnssec-parent.com.    IN      NSEC3   86400   1 0 1 abcd [next owner]
+ent.ent.auth-ent.dnssec-parent.com.    IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. IN      NS      3600    ns.example.com.
+insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. IN      NSEC3   86400   1 0 1 abcd [next owner] NS
+insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 ns1.delegated.dnssec-parent.com.       IN      A       3600    4.5.6.7
 ns1.dnssec-parent.com. IN      A       3600    1.2.3.4
 ns1.dnssec-parent.com. IN      NSEC3   86400   1 0 1 abcd [next owner] A RRSIG
@@ -40,3 +44,7 @@ secure-delegated.dnssec-parent.com.   IN      NS      3600    ns2.secure-delegated.dnssec-paren
 secure-delegated.dnssec-parent.com.    IN      NSEC3   86400   1 0 1 abcd [next owner] NS DS RRSIG
 secure-delegated.dnssec-parent.com.    IN      RRSIG   3600    DS 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
 secure-delegated.dnssec-parent.com.    IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+something1.auth-ent.dnssec-parent.com. IN      A       3600    1.1.2.3
+something1.auth-ent.dnssec-parent.com. IN      NSEC3   86400   1 0 1 abcd [next owner] A RRSIG
+something1.auth-ent.dnssec-parent.com. IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+something1.auth-ent.dnssec-parent.com. IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...

diff --git a/regression-tests/tests/axfr/expected_result.nsec3-optout b/regression-tests/tests/axfr/expected_result.nsec3-optout
index f3291b8958c419adf08ec7cfaae86d061f0f60fd..82a28a70177b73c2fdc064111478cdc1b7158b32 100644 (file)
--- a/regression-tests/tests/axfr/expected_result.nsec3-optout
+++ b/regression-tests/tests/axfr/expected_result.nsec3-optout
@@ -1,3 +1,5 @@
+auth-ent.dnssec-parent.com.    IN      NSEC3   86400   1 1 1 abcd [next owner]
+auth-ent.dnssec-parent.com.    IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 delegated.dnssec-parent.com.   IN      NS      3600    ns1.delegated.dnssec-parent.com.
 delegated.dnssec-parent.com.   IN      NS      3600    ns2.delegated.dnssec-parent.com.
 dnssec-parent.com.     IN      A       3600    9.9.9.9
@@ -15,7 +17,7 @@ dnssec-parent.com.    IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag]
 dnssec-parent.com.     IN      RRSIG   86400   NSEC3PARAM 8 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 dnssec-parent.com.     IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 dnssec-parent.com.     IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-insecure-delegated.ent.dnssec-parent.com.      IN      NS      3600    ns.example.com.
+insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. IN      NS      3600    ns.example.com.
 ns1.delegated.dnssec-parent.com.       IN      A       3600    4.5.6.7
 ns1.dnssec-parent.com. IN      A       3600    1.2.3.4
 ns1.dnssec-parent.com. IN      NSEC3   86400   1 1 1 abcd [next owner] A RRSIG
@@ -34,3 +36,7 @@ secure-delegated.dnssec-parent.com.   IN      NS      3600    ns2.secure-delegated.dnssec-paren
 secure-delegated.dnssec-parent.com.    IN      NSEC3   86400   1 1 1 abcd [next owner] NS DS RRSIG
 secure-delegated.dnssec-parent.com.    IN      RRSIG   3600    DS 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
 secure-delegated.dnssec-parent.com.    IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+something1.auth-ent.dnssec-parent.com. IN      A       3600    1.1.2.3
+something1.auth-ent.dnssec-parent.com. IN      NSEC3   86400   1 1 1 abcd [next owner] A RRSIG
+something1.auth-ent.dnssec-parent.com. IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+something1.auth-ent.dnssec-parent.com. IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...

diff --git a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result
index 890b4559a91f83c59215f4011d2570e7ea7a224c..42a8352647013a889158934d9cd186a306c089a8 100644 (file)
--- a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result
+++ b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result
@@ -1,4 +1,4 @@
-1      delegated.dnssec-parent.com.    IN      NSEC    86400   insecure-delegated.ent.dnssec-parent.com. NS RRSIG NSEC
+1      delegated.dnssec-parent.com.    IN      NSEC    86400   ns1.dnssec-parent.com. NS RRSIG NSEC
 1      delegated.dnssec-parent.com.    IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 1      dnssec-parent.com.      IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
 1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400

diff --git a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3 b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3
index 2b43c449a7960935804e482eaeaa367a18d0adab..d14292fa7ac15107f858ccda58e73b663149d432 100644 (file)
--- a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3
+++ b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3
@@ -1,4 +1,4 @@
-1      be6iqh4fjrtdhacqk7g3iq96qcvf2qoj.dnssec-parent.com.     IN      NSEC3   86400   1 0 1 abcd DVKUO8KJA65GCSQ600E6DI9U719LSJ8U NS
+1      be6iqh4fjrtdhacqk7g3iq96qcvf2qoj.dnssec-parent.com.     IN      NSEC3   86400   1 0 1 abcd BT0PJS6CH1JQ6I3QEVR9U5HQBBB8B2M4 NS
 1      be6iqh4fjrtdhacqk7g3iq96qcvf2qoj.dnssec-parent.com.     IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 1      dnssec-parent.com.      IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
 1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400

diff --git a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3-optout b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3-optout
index c8ccc4cba75b7a7a9046963f833cccfe7e61c3b8..d66320fb1b5b26d35eb3ef4a627fe2466c3a1fc5 100644 (file)
--- a/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3-optout
+++ b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3-optout
@@ -2,7 +2,7 @@
 1      7on3vems0f8k9999ikei0ig4lfijekdr.dnssec-parent.com.     IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 1      dnssec-parent.com.      IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
 1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-1      dvkuo8kja65gcsq600e6di9u719lsj8u.dnssec-parent.com.     IN      NSEC3   86400   1 1 1 abcd 1SCAQA30LQ0DO5EIRNE4KPJFBEBFGR54 A NS SOA RRSIG DNSKEY NSEC3PARAM
+1      dvkuo8kja65gcsq600e6di9u719lsj8u.dnssec-parent.com.     IN      NSEC3   86400   1 1 1 abcd NIH4L3ODLUG7EN20PENJ8DGNU4OHC98F A NS SOA RRSIG DNSKEY NSEC3PARAM
 1      dvkuo8kja65gcsq600e6di9u719lsj8u.dnssec-parent.com.     IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0

diff --git a/regression-tests/tests/ent-unsigned-delegation/command b/regression-tests/tests/ent-unsigned-delegation/command
index 72f284f96f2b0982528e7494ea840d2dd2703769..c396d86739ff69e19e25a6623a44a36f569a43b5 100755 (executable)
--- a/regression-tests/tests/ent-unsigned-delegation/command
+++ b/regression-tests/tests/ent-unsigned-delegation/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-cleandig ent.dnssec-parent.com A dnssec showflags
+cleandig ent.ent.auth-ent.dnssec-parent.com A dnssec showflags

diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result b/regression-tests/tests/ent-unsigned-delegation/expected_result
index 344f9704a227b4df5d6472b231830059eb2795b7..ddadf92efe407e113f42d619585d28f4a42f4059 100644 (file)
--- a/regression-tests/tests/ent-unsigned-delegation/expected_result
+++ b/regression-tests/tests/ent-unsigned-delegation/expected_result
@@ -1,4 +1,4 @@
 1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ent.dnssec-parent.com.', qtype=A
+Reply to question for qname='ent.ent.auth-ent.dnssec-parent.com.', qtype=A

diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result.dnssec b/regression-tests/tests/ent-unsigned-delegation/expected_result.dnssec
index 869148f0beb55558afe9c15ab20416e5c82342ec..be144f031a12e8ece18a1ccb1666421223c3661a 100644 (file)
--- a/regression-tests/tests/ent-unsigned-delegation/expected_result.dnssec
+++ b/regression-tests/tests/ent-unsigned-delegation/expected_result.dnssec
@@ -1,7 +1,7 @@
-1      delegated.dnssec-parent.com.    IN      NSEC    86400   insecure-delegated.ent.dnssec-parent.com. NS RRSIG NSEC
-1      delegated.dnssec-parent.com.    IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      IN      NSEC    86400   insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. A NS SOA RRSIG NSEC DNSKEY
 1      dnssec-parent.com.      IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      dnssec-parent.com.      IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ent.dnssec-parent.com.', qtype=A
+Reply to question for qname='ent.ent.auth-ent.dnssec-parent.com.', qtype=A

diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result.narrow b/regression-tests/tests/ent-unsigned-delegation/expected_result.narrow
index 79364ba6233e3b2e1ae93ff606adffbbc9ed3d5f..126c273a37aeb40be678d2d8125e292e75fb04c0 100644 (file)
--- a/regression-tests/tests/ent-unsigned-delegation/expected_result.narrow
+++ b/regression-tests/tests/ent-unsigned-delegation/expected_result.narrow
@@ -1,7 +1,7 @@
-1      0gi0g3b7aatt101lke76c7pjoir5meap.dnssec-parent.com.     IN      NSEC3   86400   1 1 1 abcd 0GI0G3B7AATT101LKE76C7PJOIR5MEAQ
-1      0gi0g3b7aatt101lke76c7pjoir5meap.dnssec-parent.com.     IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      7r6pbiscipot7md4qjkea2lgrd2srr19.dnssec-parent.com.     IN      NSEC3   86400   1 1 1 abcd 7R6PBISCIPOT7MD4QJKEA2LGRD2SRR1A
+1      7r6pbiscipot7md4qjkea2lgrd2srr19.dnssec-parent.com.     IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 1      dnssec-parent.com.      IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
 1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ent.dnssec-parent.com.', qtype=A
+Reply to question for qname='ent.ent.auth-ent.dnssec-parent.com.', qtype=A

diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3 b/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3
index 5aff6321335934001a5a340167adce0a01c9a1e2..36676ffdd5f69680fc7b1218fd90db9d698cf74e 100644 (file)
--- a/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3
+++ b/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3
@@ -1,7 +1,7 @@
-1      0gi0g3b7aatt101lke76c7pjoir5meap.dnssec-parent.com.     IN      NSEC3   86400   1 0 1 abcd 1SCAQA30LQ0DO5EIRNE4KPJFBEBFGR54
-1      0gi0g3b7aatt101lke76c7pjoir5meap.dnssec-parent.com.     IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      7r6pbiscipot7md4qjkea2lgrd2srr19.dnssec-parent.com.     IN      NSEC3   86400   1 0 1 abcd BE6IQH4FJRTDHACQK7G3IQ96QCVF2QOJ
+1      7r6pbiscipot7md4qjkea2lgrd2srr19.dnssec-parent.com.     IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
 1      dnssec-parent.com.      IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
 1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ent.dnssec-parent.com.', qtype=A
+Reply to question for qname='ent.ent.auth-ent.dnssec-parent.com.', qtype=A

diff --git a/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3-optout b/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3-optout
index b98f45dee6a233a2f461503d466a0a75dcdec535..1a6d862b6503965f3fa4be214c2de3b7e0f09f57 100644 (file)
--- a/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3-optout
+++ b/regression-tests/tests/ent-unsigned-delegation/expected_result.nsec3-optout
@@ -1,7 +1,9 @@
 1      dnssec-parent.com.      IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ...
 1      dnssec-parent.com.      IN      SOA     3600    ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400
-1      dvkuo8kja65gcsq600e6di9u719lsj8u.dnssec-parent.com.     IN      NSEC3   86400   1 1 1 abcd 1SCAQA30LQ0DO5EIRNE4KPJFBEBFGR54 A NS SOA RRSIG DNSKEY NSEC3PARAM
-1      dvkuo8kja65gcsq600e6di9u719lsj8u.dnssec-parent.com.     IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      nih4l3odlug7en20penj8dgnu4ohc98f.dnssec-parent.com.     IN      NSEC3   86400   1 1 1 abcd QOQSRIQRVI1G1QL3TPPH2248Q9LDPEPF
+1      nih4l3odlug7en20penj8dgnu4ohc98f.dnssec-parent.com.     IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ...
+1      qoqsriqrvi1g1ql3tpph2248q9ldpepf.dnssec-parent.com.     IN      NSEC3   86400   1 1 1 abcd 1SCAQA30LQ0DO5EIRNE4KPJFBEBFGR54 A RRSIG
+1      qoqsriqrvi1g1ql3tpph2248q9ldpepf.dnssec-parent.com.     IN      RRSIG   86400   NSEC3 8 3 86400 [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='ent.dnssec-parent.com.', qtype=A
+Reply to question for qname='ent.ent.auth-ent.dnssec-parent.com.', qtype=A

diff --git a/regression-tests/zones/dnssec-parent.com b/regression-tests/zones/dnssec-parent.com
index 6e32cc524c80b495c98158fa0af122d756fecfb3..1a6e88b6cbd5201ee8333f55e2677db96ebb755e 100644 (file)
--- a/regression-tests/zones/dnssec-parent.com
+++ b/regression-tests/zones/dnssec-parent.com
@@ -21,4 +21,5 @@ secure-delegated      IN      NS      ns1.secure-delegated.dnssec-parent.com.
 secure-delegated       IN      NS      ns2.secure-delegated.dnssec-parent.com.
 ns1.secure-delegated   IN      A       1.2.3.4
 ns2.secure-delegated   IN      A       5.6.7.8
-insecure-delegated.ent IN      NS      ns.example.com.
+insecure-delegated.ent.ent.auth-ent    IN      NS      ns.example.com.
+something1.auth-ent    IN      A       1.1.2.3