From: Kees Monshouwer Date: Mon, 2 Jun 2014 15:24:37 +0000 (+0200) Subject: unswap ttl and IN in saxfr output X-Git-Tag: auth-3.4.0-rc1~106^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac6f97d8568382319054abb45ab3413f57a7a18f;p=thirdparty%2Fpdns.git unswap ttl and IN in saxfr output --- diff --git a/pdns/saxfr.cc b/pdns/saxfr.cc index 396936a4a4..290c362e44 100644 --- a/pdns/saxfr.cc +++ b/pdns/saxfr.cc @@ -83,24 +83,24 @@ try } ostringstream o; - o<<"\tIN\t"<first.d_type); + o<<"\t"<first.d_ttl<<"\tIN\t"<first.d_type); if(showdetails) { - o<<"\t"<first.d_ttl<<"\t"<< i->first.d_content->getZoneRepresentation(); + o<<"\t"<first.d_content->getZoneRepresentation(); } else if(i->first.d_type == QType::RRSIG) { string zoneRep = i->first.d_content->getZoneRepresentation(); vector parts; stringtok(parts, zoneRep); - o<<"\t"<first.d_ttl<<"\t"<< parts[0]<<" "<first.d_type == QType::NSEC3) { string zoneRep = i->first.d_content->getZoneRepresentation(); vector parts; stringtok(parts, zoneRep); - o<<"\t"<first.d_ttl<<"\t"<first.d_content->getZoneRepresentation(); vector parts; stringtok(parts, zoneRep); - o<<"\t"<first.d_ttl<<"\t"<< parts[0]<<" "<first.d_ttl<<"\t"<< i->first.d_content->getZoneRepresentation(); + o<<"\t"<first.d_content->getZoneRepresentation(); } records.push_back(make_pair(stripDot(i->first.d_label),o.str())); diff --git a/regression-tests/tests/axfr/expected_result b/regression-tests/tests/axfr/expected_result index 09a97393cc..edeba95de0 100644 --- a/regression-tests/tests/axfr/expected_result +++ b/regression-tests/tests/axfr/expected_result @@ -1,18 +1,18 @@ -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 -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.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 -ns2.delegated.dnssec-parent.com. IN A 3600 5.6.7.8 -ns2.dnssec-parent.com. IN A 3600 4.3.2.1 -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 +delegated.dnssec-parent.com. 3600 IN NS ns1.delegated.dnssec-parent.com. +delegated.dnssec-parent.com. 3600 IN NS ns2.delegated.dnssec-parent.com. +dnssec-parent.com. 3600 IN A 9.9.9.9 +dnssec-parent.com. 3600 IN NS ns1.dnssec-parent.com. +dnssec-parent.com. 3600 IN NS ns2.dnssec-parent.com. +dnssec-parent.com. 3600 IN SOA ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400 +dnssec-parent.com. 3600 IN SOA ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400 +insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. 3600 IN NS ns.example.com. +ns1.delegated.dnssec-parent.com. 3600 IN A 4.5.6.7 +ns1.dnssec-parent.com. 3600 IN A 1.2.3.4 +ns1.secure-delegated.dnssec-parent.com. 3600 IN A 1.2.3.4 +ns2.delegated.dnssec-parent.com. 3600 IN A 5.6.7.8 +ns2.dnssec-parent.com. 3600 IN A 4.3.2.1 +ns2.secure-delegated.dnssec-parent.com. 3600 IN A 5.6.7.8 +secure-delegated.dnssec-parent.com. 3600 IN DS 54319 8 2 a0b9c38cd324182af0ef66830d0a0e85a1d58979c9834e18c871779e040857b7 +secure-delegated.dnssec-parent.com. 3600 IN NS ns1.secure-delegated.dnssec-parent.com. +secure-delegated.dnssec-parent.com. 3600 IN NS ns2.secure-delegated.dnssec-parent.com. +something1.auth-ent.dnssec-parent.com. 3600 IN A 1.1.2.3 diff --git a/regression-tests/tests/axfr/expected_result.dnssec b/regression-tests/tests/axfr/expected_result.dnssec index 95536a90eb..285d2d92d1 100644 --- a/regression-tests/tests/axfr/expected_result.dnssec +++ b/regression-tests/tests/axfr/expected_result.dnssec @@ -1,42 +1,42 @@ -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 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 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. ... -dnssec-parent.com. IN RRSIG 86400 DNSKEY 8 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... -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.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 -ns1.dnssec-parent.com. IN RRSIG 3600 A 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... -ns1.dnssec-parent.com. IN RRSIG 86400 NSEC 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... -ns1.secure-delegated.dnssec-parent.com. IN A 3600 1.2.3.4 -ns2.delegated.dnssec-parent.com. IN A 3600 5.6.7.8 -ns2.dnssec-parent.com. IN A 3600 4.3.2.1 -ns2.dnssec-parent.com. IN NSEC 86400 secure-delegated.dnssec-parent.com. A RRSIG NSEC -ns2.dnssec-parent.com. IN RRSIG 3600 A 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... -ns2.dnssec-parent.com. IN RRSIG 86400 NSEC 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... -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. -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. ... +delegated.dnssec-parent.com. 3600 IN NS ns1.delegated.dnssec-parent.com. +delegated.dnssec-parent.com. 3600 IN NS ns2.delegated.dnssec-parent.com. +delegated.dnssec-parent.com. 86400 IN NSEC ns1.dnssec-parent.com. NS RRSIG NSEC +delegated.dnssec-parent.com. 86400 IN RRSIG NSEC 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 3600 IN A 9.9.9.9 +dnssec-parent.com. 3600 IN NS ns1.dnssec-parent.com. +dnssec-parent.com. 3600 IN NS ns2.dnssec-parent.com. +dnssec-parent.com. 3600 IN RRSIG A 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 3600 IN RRSIG NS 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 3600 IN RRSIG SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 3600 IN SOA ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400 +dnssec-parent.com. 3600 IN SOA ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400 +dnssec-parent.com. 86400 IN DNSKEY 256 3 8 ... +dnssec-parent.com. 86400 IN DNSKEY 257 3 8 ... +dnssec-parent.com. 86400 IN NSEC insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. A NS SOA RRSIG NSEC DNSKEY +dnssec-parent.com. 86400 IN RRSIG DNSKEY 8 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 86400 IN RRSIG NSEC 8 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. 3600 IN NS ns.example.com. +insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. 86400 IN NSEC something1.auth-ent.dnssec-parent.com. NS RRSIG NSEC +insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. 86400 IN RRSIG NSEC 8 6 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +ns1.delegated.dnssec-parent.com. 3600 IN A 4.5.6.7 +ns1.dnssec-parent.com. 3600 IN A 1.2.3.4 +ns1.dnssec-parent.com. 3600 IN RRSIG A 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +ns1.dnssec-parent.com. 86400 IN NSEC ns2.dnssec-parent.com. A RRSIG NSEC +ns1.dnssec-parent.com. 86400 IN RRSIG NSEC 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +ns1.secure-delegated.dnssec-parent.com. 3600 IN A 1.2.3.4 +ns2.delegated.dnssec-parent.com. 3600 IN A 5.6.7.8 +ns2.dnssec-parent.com. 3600 IN A 4.3.2.1 +ns2.dnssec-parent.com. 3600 IN RRSIG A 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +ns2.dnssec-parent.com. 86400 IN NSEC secure-delegated.dnssec-parent.com. A RRSIG NSEC +ns2.dnssec-parent.com. 86400 IN RRSIG NSEC 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +ns2.secure-delegated.dnssec-parent.com. 3600 IN A 5.6.7.8 +secure-delegated.dnssec-parent.com. 3600 IN DS 54319 8 2 a0b9c38cd324182af0ef66830d0a0e85a1d58979c9834e18c871779e040857b7 +secure-delegated.dnssec-parent.com. 3600 IN NS ns1.secure-delegated.dnssec-parent.com. +secure-delegated.dnssec-parent.com. 3600 IN NS ns2.secure-delegated.dnssec-parent.com. +secure-delegated.dnssec-parent.com. 3600 IN RRSIG DS 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +secure-delegated.dnssec-parent.com. 86400 IN NSEC dnssec-parent.com. NS DS RRSIG NSEC +secure-delegated.dnssec-parent.com. 86400 IN RRSIG NSEC 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +something1.auth-ent.dnssec-parent.com. 3600 IN A 1.1.2.3 +something1.auth-ent.dnssec-parent.com. 3600 IN RRSIG A 8 4 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +something1.auth-ent.dnssec-parent.com. 86400 IN NSEC delegated.dnssec-parent.com. A RRSIG NSEC +something1.auth-ent.dnssec-parent.com. 86400 IN RRSIG 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 2e61e4425f..fac00d14f5 100644 --- a/regression-tests/tests/axfr/expected_result.nsec3 +++ b/regression-tests/tests/axfr/expected_result.nsec3 @@ -1,50 +1,50 @@ -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 -delegated.dnssec-parent.com. IN RRSIG 86400 NSEC3 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 NSEC3 86400 1 0 1 abcd [next owner] A NS SOA RRSIG DNSKEY NSEC3PARAM -dnssec-parent.com. IN NSEC3PARAM 86400 1 0 1 abcd -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. ... -dnssec-parent.com. IN RRSIG 86400 DNSKEY 8 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... -dnssec-parent.com. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... -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.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 -ns1.dnssec-parent.com. IN RRSIG 3600 A 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... -ns1.dnssec-parent.com. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... -ns1.secure-delegated.dnssec-parent.com. IN A 3600 1.2.3.4 -ns2.delegated.dnssec-parent.com. IN A 3600 5.6.7.8 -ns2.dnssec-parent.com. IN A 3600 4.3.2.1 -ns2.dnssec-parent.com. IN NSEC3 86400 1 0 1 abcd [next owner] A RRSIG -ns2.dnssec-parent.com. IN RRSIG 3600 A 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... -ns2.dnssec-parent.com. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... -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. -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. ... +auth-ent.dnssec-parent.com. 86400 IN NSEC3 1 0 1 abcd [next owner] +auth-ent.dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +delegated.dnssec-parent.com. 3600 IN NS ns1.delegated.dnssec-parent.com. +delegated.dnssec-parent.com. 3600 IN NS ns2.delegated.dnssec-parent.com. +delegated.dnssec-parent.com. 86400 IN NSEC3 1 0 1 abcd [next owner] NS +delegated.dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 3600 IN A 9.9.9.9 +dnssec-parent.com. 3600 IN NS ns1.dnssec-parent.com. +dnssec-parent.com. 3600 IN NS ns2.dnssec-parent.com. +dnssec-parent.com. 3600 IN RRSIG A 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 3600 IN RRSIG NS 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 3600 IN RRSIG SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 3600 IN SOA ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400 +dnssec-parent.com. 3600 IN SOA ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400 +dnssec-parent.com. 86400 IN DNSKEY 256 3 8 ... +dnssec-parent.com. 86400 IN DNSKEY 257 3 8 ... +dnssec-parent.com. 86400 IN NSEC3 1 0 1 abcd [next owner] A NS SOA RRSIG DNSKEY NSEC3PARAM +dnssec-parent.com. 86400 IN NSEC3PARAM 1 0 1 abcd +dnssec-parent.com. 86400 IN RRSIG DNSKEY 8 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 86400 IN RRSIG NSEC3PARAM 8 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +ent.auth-ent.dnssec-parent.com. 86400 IN NSEC3 1 0 1 abcd [next owner] +ent.auth-ent.dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +ent.ent.auth-ent.dnssec-parent.com. 86400 IN NSEC3 1 0 1 abcd [next owner] +ent.ent.auth-ent.dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. 3600 IN NS ns.example.com. +insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. 86400 IN NSEC3 1 0 1 abcd [next owner] NS +insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +ns1.delegated.dnssec-parent.com. 3600 IN A 4.5.6.7 +ns1.dnssec-parent.com. 3600 IN A 1.2.3.4 +ns1.dnssec-parent.com. 3600 IN RRSIG A 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +ns1.dnssec-parent.com. 86400 IN NSEC3 1 0 1 abcd [next owner] A RRSIG +ns1.dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +ns1.secure-delegated.dnssec-parent.com. 3600 IN A 1.2.3.4 +ns2.delegated.dnssec-parent.com. 3600 IN A 5.6.7.8 +ns2.dnssec-parent.com. 3600 IN A 4.3.2.1 +ns2.dnssec-parent.com. 3600 IN RRSIG A 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +ns2.dnssec-parent.com. 86400 IN NSEC3 1 0 1 abcd [next owner] A RRSIG +ns2.dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +ns2.secure-delegated.dnssec-parent.com. 3600 IN A 5.6.7.8 +secure-delegated.dnssec-parent.com. 3600 IN DS 54319 8 2 a0b9c38cd324182af0ef66830d0a0e85a1d58979c9834e18c871779e040857b7 +secure-delegated.dnssec-parent.com. 3600 IN NS ns1.secure-delegated.dnssec-parent.com. +secure-delegated.dnssec-parent.com. 3600 IN NS ns2.secure-delegated.dnssec-parent.com. +secure-delegated.dnssec-parent.com. 3600 IN RRSIG DS 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +secure-delegated.dnssec-parent.com. 86400 IN NSEC3 1 0 1 abcd [next owner] NS DS RRSIG +secure-delegated.dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +something1.auth-ent.dnssec-parent.com. 3600 IN A 1.1.2.3 +something1.auth-ent.dnssec-parent.com. 3600 IN RRSIG A 8 4 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +something1.auth-ent.dnssec-parent.com. 86400 IN NSEC3 1 0 1 abcd [next owner] A RRSIG +something1.auth-ent.dnssec-parent.com. 86400 IN RRSIG 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 82a28a7017..c1aac67844 100644 --- a/regression-tests/tests/axfr/expected_result.nsec3-optout +++ b/regression-tests/tests/axfr/expected_result.nsec3-optout @@ -1,42 +1,42 @@ -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 -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 NSEC3 86400 1 1 1 abcd [next owner] A NS SOA RRSIG DNSKEY NSEC3PARAM -dnssec-parent.com. IN NSEC3PARAM 86400 1 0 1 abcd -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. ... -dnssec-parent.com. IN RRSIG 86400 DNSKEY 8 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... -dnssec-parent.com. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... -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.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 -ns1.dnssec-parent.com. IN RRSIG 3600 A 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... -ns1.dnssec-parent.com. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... -ns1.secure-delegated.dnssec-parent.com. IN A 3600 1.2.3.4 -ns2.delegated.dnssec-parent.com. IN A 3600 5.6.7.8 -ns2.dnssec-parent.com. IN A 3600 4.3.2.1 -ns2.dnssec-parent.com. IN NSEC3 86400 1 1 1 abcd [next owner] A RRSIG -ns2.dnssec-parent.com. IN RRSIG 3600 A 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... -ns2.dnssec-parent.com. IN RRSIG 86400 NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... -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. -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. ... +auth-ent.dnssec-parent.com. 86400 IN NSEC3 1 1 1 abcd [next owner] +auth-ent.dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +delegated.dnssec-parent.com. 3600 IN NS ns1.delegated.dnssec-parent.com. +delegated.dnssec-parent.com. 3600 IN NS ns2.delegated.dnssec-parent.com. +dnssec-parent.com. 3600 IN A 9.9.9.9 +dnssec-parent.com. 3600 IN NS ns1.dnssec-parent.com. +dnssec-parent.com. 3600 IN NS ns2.dnssec-parent.com. +dnssec-parent.com. 3600 IN RRSIG A 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 3600 IN RRSIG NS 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 3600 IN RRSIG SOA 8 2 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 3600 IN SOA ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400 +dnssec-parent.com. 3600 IN SOA ns1.dnssec-parent.com. ahu.example.com. 2005092501 28800 7200 604800 86400 +dnssec-parent.com. 86400 IN DNSKEY 256 3 8 ... +dnssec-parent.com. 86400 IN DNSKEY 257 3 8 ... +dnssec-parent.com. 86400 IN NSEC3 1 1 1 abcd [next owner] A NS SOA RRSIG DNSKEY NSEC3PARAM +dnssec-parent.com. 86400 IN NSEC3PARAM 1 0 1 abcd +dnssec-parent.com. 86400 IN RRSIG DNSKEY 8 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +dnssec-parent.com. 86400 IN RRSIG NSEC3PARAM 8 2 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +insecure-delegated.ent.ent.auth-ent.dnssec-parent.com. 3600 IN NS ns.example.com. +ns1.delegated.dnssec-parent.com. 3600 IN A 4.5.6.7 +ns1.dnssec-parent.com. 3600 IN A 1.2.3.4 +ns1.dnssec-parent.com. 3600 IN RRSIG A 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +ns1.dnssec-parent.com. 86400 IN NSEC3 1 1 1 abcd [next owner] A RRSIG +ns1.dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +ns1.secure-delegated.dnssec-parent.com. 3600 IN A 1.2.3.4 +ns2.delegated.dnssec-parent.com. 3600 IN A 5.6.7.8 +ns2.dnssec-parent.com. 3600 IN A 4.3.2.1 +ns2.dnssec-parent.com. 3600 IN RRSIG A 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +ns2.dnssec-parent.com. 86400 IN NSEC3 1 1 1 abcd [next owner] A RRSIG +ns2.dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +ns2.secure-delegated.dnssec-parent.com. 3600 IN A 5.6.7.8 +secure-delegated.dnssec-parent.com. 3600 IN DS 54319 8 2 a0b9c38cd324182af0ef66830d0a0e85a1d58979c9834e18c871779e040857b7 +secure-delegated.dnssec-parent.com. 3600 IN NS ns1.secure-delegated.dnssec-parent.com. +secure-delegated.dnssec-parent.com. 3600 IN NS ns2.secure-delegated.dnssec-parent.com. +secure-delegated.dnssec-parent.com. 3600 IN RRSIG DS 8 3 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +secure-delegated.dnssec-parent.com. 86400 IN NSEC3 1 1 1 abcd [next owner] NS DS RRSIG +secure-delegated.dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... +something1.auth-ent.dnssec-parent.com. 3600 IN A 1.1.2.3 +something1.auth-ent.dnssec-parent.com. 3600 IN RRSIG A 8 4 3600 [expiry] [inception] [keytag] dnssec-parent.com. ... +something1.auth-ent.dnssec-parent.com. 86400 IN NSEC3 1 1 1 abcd [next owner] A RRSIG +something1.auth-ent.dnssec-parent.com. 86400 IN RRSIG NSEC3 8 3 86400 [expiry] [inception] [keytag] dnssec-parent.com. ... diff --git a/regression-tests/tests/ent-axfr/expected_result b/regression-tests/tests/ent-axfr/expected_result index 6d584c4f1c..20c4e73d67 100644 --- a/regression-tests/tests/ent-axfr/expected_result +++ b/regression-tests/tests/ent-axfr/expected_result @@ -1,22 +1,22 @@ -*.a.b.c.test.com. IN NSEC 86400 counter.test.com. A RRSIG NSEC -*.test.test.com. IN NSEC 86400 sub.test.test.com. CNAME RRSIG NSEC -_double._tcp.dc.test.com. IN NSEC 86400 _ldap._tcp.dc.test.com. SRV RRSIG NSEC -_ldap._tcp.dc.test.com. IN NSEC 86400 _root._tcp.dc.test.com. SRV RRSIG NSEC -_root._tcp.dc.test.com. IN NSEC 86400 enum.test.com. SRV RRSIG NSEC -_underscore.test.com. IN NSEC 86400 aland.test.com. TXT RRSIG NSEC -aland.test.com. IN NSEC 86400 blah.test.com. TXT RRSIG NSEC -b.c.test.com. IN NSEC 86400 *.a.b.c.test.com. A RRSIG NSEC -blah.test.com. IN NSEC 86400 b.c.test.com. NS RRSIG NSEC -counter.test.com. IN NSEC 86400 d.test.com. A RRSIG NSEC -d.test.com. IN NSEC 86400 _double._tcp.dc.test.com. DNAME RRSIG NSEC -enum.test.com. IN NSEC 86400 hightxt.test.com. NAPTR RRSIG NSEC -hightxt.test.com. IN NSEC 86400 ns1.test.com. TXT RRSIG NSEC SPF -ns1.test.com. IN NSEC 86400 ns2.test.com. A RRSIG NSEC -ns2.test.com. IN NSEC 86400 server1.test.com. A RRSIG NSEC -server1.test.com. IN NSEC 86400 *.test.test.com. A RP RRSIG NSEC -sub.test.test.com. IN NSEC 86400 www.test.test.com. NS RRSIG NSEC -test.com. IN NSEC 86400 _underscore.test.com. NS SOA MX RRSIG NSEC DNSKEY -very-long-txt.test.com. IN NSEC 86400 within-server.test.com. TXT RRSIG NSEC -within-server.test.com. IN NSEC 86400 www.test.com. CNAME RRSIG NSEC -www.test.com. IN NSEC 86400 test.com. CNAME RRSIG NSEC -www.test.test.com. IN NSEC 86400 very-long-txt.test.com. A RRSIG NSEC +*.a.b.c.test.com. 86400 IN NSEC counter.test.com. A RRSIG NSEC +*.test.test.com. 86400 IN NSEC sub.test.test.com. CNAME RRSIG NSEC +_double._tcp.dc.test.com. 86400 IN NSEC _ldap._tcp.dc.test.com. SRV RRSIG NSEC +_ldap._tcp.dc.test.com. 86400 IN NSEC _root._tcp.dc.test.com. SRV RRSIG NSEC +_root._tcp.dc.test.com. 86400 IN NSEC enum.test.com. SRV RRSIG NSEC +_underscore.test.com. 86400 IN NSEC aland.test.com. TXT RRSIG NSEC +aland.test.com. 86400 IN NSEC blah.test.com. TXT RRSIG NSEC +b.c.test.com. 86400 IN NSEC *.a.b.c.test.com. A RRSIG NSEC +blah.test.com. 86400 IN NSEC b.c.test.com. NS RRSIG NSEC +counter.test.com. 86400 IN NSEC d.test.com. A RRSIG NSEC +d.test.com. 86400 IN NSEC _double._tcp.dc.test.com. DNAME RRSIG NSEC +enum.test.com. 86400 IN NSEC hightxt.test.com. NAPTR RRSIG NSEC +hightxt.test.com. 86400 IN NSEC ns1.test.com. TXT RRSIG NSEC SPF +ns1.test.com. 86400 IN NSEC ns2.test.com. A RRSIG NSEC +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 +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 diff --git a/regression-tests/tests/ent-axfr/expected_result.nsec3 b/regression-tests/tests/ent-axfr/expected_result.nsec3 index 6e41649cd6..82e2ba1a90 100644 --- a/regression-tests/tests/ent-axfr/expected_result.nsec3 +++ b/regression-tests/tests/ent-axfr/expected_result.nsec3 @@ -1,28 +1,28 @@ -0bh8di769i8vvtkdds8efjda19abigo5.test.com. IN NSEC3 86400 1 0 1 abcd 2EU2GULBU53H9UVHFALSHPBO2A83T6L2 TXT RRSIG SPF -2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com. IN NSEC3 86400 1 0 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM -2gks2n3jpqf62qohavfq1pholm3hr7ra.test.com. IN NSEC3 86400 1 0 1 abcd 4UL8F3M96VCONEA85U93DH9SG570J4FU TXT RRSIG -4ul8f3m96vconea85u93dh9sg570j4fu.test.com. IN NSEC3 86400 1 0 1 abcd 53L445R26RG1CSBI4TS1K3I3EL1F30VM DNAME RRSIG -53l445r26rg1csbi4ts1k3i3el1f30vm.test.com. IN NSEC3 86400 1 0 1 abcd 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V SRV RRSIG -79ra8k3g5kai1hg9jlhbr6p0tp933m7v.test.com. IN NSEC3 86400 1 0 1 abcd 79U3DAS6UCCTNS1BR3TVD8QKANNI351L A RRSIG -79u3das6ucctns1br3tvd8qkanni351l.test.com. IN NSEC3 86400 1 0 1 abcd 7MMURA8H40BE5N4KOAN7RNMKURSAMH99 -7mmura8h40be5n4koan7rnmkursamh99.test.com. IN NSEC3 86400 1 0 1 abcd 88F1BQRB2ISCVFEL2SQQCKSVFLNEKAP6 -88f1bqrb2iscvfel2sqqcksvflnekap6.test.com. IN NSEC3 86400 1 0 1 abcd A5LABAGJJEVR86GH0HF3JG7NUFHGA5AR CNAME RRSIG -a5labagjjevr86gh0hf3jg7nufhga5ar.test.com. IN NSEC3 86400 1 0 1 abcd AOVP95MR44HQEFRQUS6NOMSD944BM3VB A RRSIG -aovp95mr44hqefrqus6nomsd944bm3vb.test.com. IN NSEC3 86400 1 0 1 abcd B022O9DKSAJ737FH77E7KQQTJ3OM56KI A RRSIG -b022o9dksaj737fh77e7kqqtj3om56ki.test.com. IN NSEC3 86400 1 0 1 abcd DAFC69CV5N2TFCF6OVBVTV94DRGMQJO5 -dafc69cv5n2tfcf6ovbvtv94drgmqjo5.test.com. IN NSEC3 86400 1 0 1 abcd DE592K86U3HEVDJ57JPBT7J5KV7DOO78 TXT RRSIG -de592k86u3hevdj57jpbt7j5kv7doo78.test.com. IN NSEC3 86400 1 0 1 abcd EBAN51BJGUGORB20UNP5PEEC7S5D2EKA NS -eban51bjgugorb20unp5peec7s5d2eka.test.com. IN NSEC3 86400 1 0 1 abcd H5855RVON2AASM8QV1NK49I1B2MKBEJP SRV RRSIG -h5855rvon2aasm8qv1nk49i1b2mkbejp.test.com. IN NSEC3 86400 1 0 1 abcd IAI9HIN25MEH689R5V5GTIFK8OM5DI0E A RRSIG -iai9hin25meh689r5v5gtifk8om5di0e.test.com. IN NSEC3 86400 1 0 1 abcd IGF4M7OTECACH14P0A6INGI7DBUAS5B2 A RRSIG -igf4m7otecach14p0a6ingi7dbuas5b2.test.com. IN NSEC3 86400 1 0 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 A RP RRSIG -o1l0fb73hi3qp4a3fnqjsleanlc883i3.test.com. IN NSEC3 86400 1 0 1 abcd PLUD9QQECURIL62GCFP8BR44I7EOQ7C9 TXT RRSIG -plud9qqecuril62gcfp8br44i7eoq7c9.test.com. IN NSEC3 86400 1 0 1 abcd QD81AG9INQTS1OCS7API0PJI94K27BTR SRV RRSIG -qd81ag9inqts1ocs7api0pji94k27btr.test.com. IN NSEC3 86400 1 0 1 abcd S6G5SHC1JVOVL5FL9E943ADLONQLN7G4 CNAME RRSIG -s6g5shc1jvovl5fl9e943adlonqln7g4.test.com. IN NSEC3 86400 1 0 1 abcd S96H2QICBT8D9I5AA43KP8SJJRESQ4KB -s96h2qicbt8d9i5aa43kp8sjjresq4kb.test.com. IN NSEC3 86400 1 0 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA NS -sa5vvpqn1coejgj3hbkfekdnii8kksqa.test.com. IN NSEC3 86400 1 0 1 abcd SRA2SM4PL136BULTASS7QQNLBLIPE8AM NAPTR RRSIG -sra2sm4pl136bultass7qqnlblipe8am.test.com. IN NSEC3 86400 1 0 1 abcd U02UTT5Q2BHJCQ986F05MBAP0PGAMT5O CNAME RRSIG -test.com. IN NSEC3PARAM 86400 1 0 1 abcd -u02utt5q2bhjcq986f05mbap0pgamt5o.test.com. IN NSEC3 86400 1 0 1 abcd VLVUJATANOF6FEAJOESTI9KQ4S0CRST3 A RRSIG -vlvujatanof6feajoesti9kq4s0crst3.test.com. IN NSEC3 86400 1 0 1 abcd 0BH8DI769I8VVTKDDS8EFJDA19ABIGO5 +0bh8di769i8vvtkdds8efjda19abigo5.test.com. 86400 IN NSEC3 1 0 1 abcd 2EU2GULBU53H9UVHFALSHPBO2A83T6L2 TXT RRSIG SPF +2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com. 86400 IN NSEC3 1 0 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM +2gks2n3jpqf62qohavfq1pholm3hr7ra.test.com. 86400 IN NSEC3 1 0 1 abcd 4UL8F3M96VCONEA85U93DH9SG570J4FU TXT RRSIG +4ul8f3m96vconea85u93dh9sg570j4fu.test.com. 86400 IN NSEC3 1 0 1 abcd 53L445R26RG1CSBI4TS1K3I3EL1F30VM DNAME RRSIG +53l445r26rg1csbi4ts1k3i3el1f30vm.test.com. 86400 IN NSEC3 1 0 1 abcd 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V SRV RRSIG +79ra8k3g5kai1hg9jlhbr6p0tp933m7v.test.com. 86400 IN NSEC3 1 0 1 abcd 79U3DAS6UCCTNS1BR3TVD8QKANNI351L A RRSIG +79u3das6ucctns1br3tvd8qkanni351l.test.com. 86400 IN NSEC3 1 0 1 abcd 7MMURA8H40BE5N4KOAN7RNMKURSAMH99 +7mmura8h40be5n4koan7rnmkursamh99.test.com. 86400 IN NSEC3 1 0 1 abcd 88F1BQRB2ISCVFEL2SQQCKSVFLNEKAP6 +88f1bqrb2iscvfel2sqqcksvflnekap6.test.com. 86400 IN NSEC3 1 0 1 abcd A5LABAGJJEVR86GH0HF3JG7NUFHGA5AR CNAME RRSIG +a5labagjjevr86gh0hf3jg7nufhga5ar.test.com. 86400 IN NSEC3 1 0 1 abcd AOVP95MR44HQEFRQUS6NOMSD944BM3VB A RRSIG +aovp95mr44hqefrqus6nomsd944bm3vb.test.com. 86400 IN NSEC3 1 0 1 abcd B022O9DKSAJ737FH77E7KQQTJ3OM56KI A RRSIG +b022o9dksaj737fh77e7kqqtj3om56ki.test.com. 86400 IN NSEC3 1 0 1 abcd DAFC69CV5N2TFCF6OVBVTV94DRGMQJO5 +dafc69cv5n2tfcf6ovbvtv94drgmqjo5.test.com. 86400 IN NSEC3 1 0 1 abcd DE592K86U3HEVDJ57JPBT7J5KV7DOO78 TXT RRSIG +de592k86u3hevdj57jpbt7j5kv7doo78.test.com. 86400 IN NSEC3 1 0 1 abcd EBAN51BJGUGORB20UNP5PEEC7S5D2EKA NS +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 +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 +s6g5shc1jvovl5fl9e943adlonqln7g4.test.com. 86400 IN NSEC3 1 0 1 abcd S96H2QICBT8D9I5AA43KP8SJJRESQ4KB +s96h2qicbt8d9i5aa43kp8sjjresq4kb.test.com. 86400 IN NSEC3 1 0 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA NS +sa5vvpqn1coejgj3hbkfekdnii8kksqa.test.com. 86400 IN NSEC3 1 0 1 abcd SRA2SM4PL136BULTASS7QQNLBLIPE8AM NAPTR RRSIG +sra2sm4pl136bultass7qqnlblipe8am.test.com. 86400 IN NSEC3 1 0 1 abcd U02UTT5Q2BHJCQ986F05MBAP0PGAMT5O CNAME RRSIG +test.com. 86400 IN NSEC3PARAM 1 0 1 abcd +u02utt5q2bhjcq986f05mbap0pgamt5o.test.com. 86400 IN NSEC3 1 0 1 abcd VLVUJATANOF6FEAJOESTI9KQ4S0CRST3 A RRSIG +vlvujatanof6feajoesti9kq4s0crst3.test.com. 86400 IN NSEC3 1 0 1 abcd 0BH8DI769I8VVTKDDS8EFJDA19ABIGO5 diff --git a/regression-tests/tests/ent-axfr/expected_result.nsec3-optout b/regression-tests/tests/ent-axfr/expected_result.nsec3-optout index d050528e67..adc712a361 100644 --- a/regression-tests/tests/ent-axfr/expected_result.nsec3-optout +++ b/regression-tests/tests/ent-axfr/expected_result.nsec3-optout @@ -1,26 +1,26 @@ -0bh8di769i8vvtkdds8efjda19abigo5.test.com. IN NSEC3 86400 1 1 1 abcd 2EU2GULBU53H9UVHFALSHPBO2A83T6L2 TXT RRSIG SPF -2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com. IN NSEC3 86400 1 1 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM -2gks2n3jpqf62qohavfq1pholm3hr7ra.test.com. IN NSEC3 86400 1 1 1 abcd 4UL8F3M96VCONEA85U93DH9SG570J4FU TXT RRSIG -4ul8f3m96vconea85u93dh9sg570j4fu.test.com. IN NSEC3 86400 1 1 1 abcd 53L445R26RG1CSBI4TS1K3I3EL1F30VM DNAME RRSIG -53l445r26rg1csbi4ts1k3i3el1f30vm.test.com. IN NSEC3 86400 1 1 1 abcd 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V SRV RRSIG -79ra8k3g5kai1hg9jlhbr6p0tp933m7v.test.com. IN NSEC3 86400 1 1 1 abcd 79U3DAS6UCCTNS1BR3TVD8QKANNI351L A RRSIG -79u3das6ucctns1br3tvd8qkanni351l.test.com. IN NSEC3 86400 1 1 1 abcd 7MMURA8H40BE5N4KOAN7RNMKURSAMH99 -7mmura8h40be5n4koan7rnmkursamh99.test.com. IN NSEC3 86400 1 1 1 abcd 88F1BQRB2ISCVFEL2SQQCKSVFLNEKAP6 -88f1bqrb2iscvfel2sqqcksvflnekap6.test.com. IN NSEC3 86400 1 1 1 abcd A5LABAGJJEVR86GH0HF3JG7NUFHGA5AR CNAME RRSIG -a5labagjjevr86gh0hf3jg7nufhga5ar.test.com. IN NSEC3 86400 1 1 1 abcd AOVP95MR44HQEFRQUS6NOMSD944BM3VB A RRSIG -aovp95mr44hqefrqus6nomsd944bm3vb.test.com. IN NSEC3 86400 1 1 1 abcd B022O9DKSAJ737FH77E7KQQTJ3OM56KI A RRSIG -b022o9dksaj737fh77e7kqqtj3om56ki.test.com. IN NSEC3 86400 1 1 1 abcd DAFC69CV5N2TFCF6OVBVTV94DRGMQJO5 -dafc69cv5n2tfcf6ovbvtv94drgmqjo5.test.com. IN NSEC3 86400 1 1 1 abcd EBAN51BJGUGORB20UNP5PEEC7S5D2EKA TXT RRSIG -eban51bjgugorb20unp5peec7s5d2eka.test.com. IN NSEC3 86400 1 1 1 abcd H5855RVON2AASM8QV1NK49I1B2MKBEJP SRV RRSIG -h5855rvon2aasm8qv1nk49i1b2mkbejp.test.com. IN NSEC3 86400 1 1 1 abcd IAI9HIN25MEH689R5V5GTIFK8OM5DI0E A RRSIG -iai9hin25meh689r5v5gtifk8om5di0e.test.com. IN NSEC3 86400 1 1 1 abcd IGF4M7OTECACH14P0A6INGI7DBUAS5B2 A RRSIG -igf4m7otecach14p0a6ingi7dbuas5b2.test.com. IN NSEC3 86400 1 1 1 abcd O1L0FB73HI3QP4A3FNQJSLEANLC883I3 A RP RRSIG -o1l0fb73hi3qp4a3fnqjsleanlc883i3.test.com. IN NSEC3 86400 1 1 1 abcd PLUD9QQECURIL62GCFP8BR44I7EOQ7C9 TXT RRSIG -plud9qqecuril62gcfp8br44i7eoq7c9.test.com. IN NSEC3 86400 1 1 1 abcd QD81AG9INQTS1OCS7API0PJI94K27BTR SRV RRSIG -qd81ag9inqts1ocs7api0pji94k27btr.test.com. IN NSEC3 86400 1 1 1 abcd S6G5SHC1JVOVL5FL9E943ADLONQLN7G4 CNAME RRSIG -s6g5shc1jvovl5fl9e943adlonqln7g4.test.com. IN NSEC3 86400 1 1 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA -sa5vvpqn1coejgj3hbkfekdnii8kksqa.test.com. IN NSEC3 86400 1 1 1 abcd SRA2SM4PL136BULTASS7QQNLBLIPE8AM NAPTR RRSIG -sra2sm4pl136bultass7qqnlblipe8am.test.com. IN NSEC3 86400 1 1 1 abcd U02UTT5Q2BHJCQ986F05MBAP0PGAMT5O CNAME RRSIG -test.com. IN NSEC3PARAM 86400 1 0 1 abcd -u02utt5q2bhjcq986f05mbap0pgamt5o.test.com. IN NSEC3 86400 1 1 1 abcd VLVUJATANOF6FEAJOESTI9KQ4S0CRST3 A RRSIG -vlvujatanof6feajoesti9kq4s0crst3.test.com. IN NSEC3 86400 1 1 1 abcd 0BH8DI769I8VVTKDDS8EFJDA19ABIGO5 +0bh8di769i8vvtkdds8efjda19abigo5.test.com. 86400 IN NSEC3 1 1 1 abcd 2EU2GULBU53H9UVHFALSHPBO2A83T6L2 TXT RRSIG SPF +2eu2gulbu53h9uvhfalshpbo2a83t6l2.test.com. 86400 IN NSEC3 1 1 1 abcd 2GKS2N3JPQF62QOHAVFQ1PHOLM3HR7RA NS SOA MX RRSIG DNSKEY NSEC3PARAM +2gks2n3jpqf62qohavfq1pholm3hr7ra.test.com. 86400 IN NSEC3 1 1 1 abcd 4UL8F3M96VCONEA85U93DH9SG570J4FU TXT RRSIG +4ul8f3m96vconea85u93dh9sg570j4fu.test.com. 86400 IN NSEC3 1 1 1 abcd 53L445R26RG1CSBI4TS1K3I3EL1F30VM DNAME RRSIG +53l445r26rg1csbi4ts1k3i3el1f30vm.test.com. 86400 IN NSEC3 1 1 1 abcd 79RA8K3G5KAI1HG9JLHBR6P0TP933M7V SRV RRSIG +79ra8k3g5kai1hg9jlhbr6p0tp933m7v.test.com. 86400 IN NSEC3 1 1 1 abcd 79U3DAS6UCCTNS1BR3TVD8QKANNI351L A RRSIG +79u3das6ucctns1br3tvd8qkanni351l.test.com. 86400 IN NSEC3 1 1 1 abcd 7MMURA8H40BE5N4KOAN7RNMKURSAMH99 +7mmura8h40be5n4koan7rnmkursamh99.test.com. 86400 IN NSEC3 1 1 1 abcd 88F1BQRB2ISCVFEL2SQQCKSVFLNEKAP6 +88f1bqrb2iscvfel2sqqcksvflnekap6.test.com. 86400 IN NSEC3 1 1 1 abcd A5LABAGJJEVR86GH0HF3JG7NUFHGA5AR CNAME RRSIG +a5labagjjevr86gh0hf3jg7nufhga5ar.test.com. 86400 IN NSEC3 1 1 1 abcd AOVP95MR44HQEFRQUS6NOMSD944BM3VB A RRSIG +aovp95mr44hqefrqus6nomsd944bm3vb.test.com. 86400 IN NSEC3 1 1 1 abcd B022O9DKSAJ737FH77E7KQQTJ3OM56KI A RRSIG +b022o9dksaj737fh77e7kqqtj3om56ki.test.com. 86400 IN NSEC3 1 1 1 abcd DAFC69CV5N2TFCF6OVBVTV94DRGMQJO5 +dafc69cv5n2tfcf6ovbvtv94drgmqjo5.test.com. 86400 IN NSEC3 1 1 1 abcd EBAN51BJGUGORB20UNP5PEEC7S5D2EKA TXT RRSIG +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 +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 +s6g5shc1jvovl5fl9e943adlonqln7g4.test.com. 86400 IN NSEC3 1 1 1 abcd SA5VVPQN1COEJGJ3HBKFEKDNII8KKSQA +sa5vvpqn1coejgj3hbkfekdnii8kksqa.test.com. 86400 IN NSEC3 1 1 1 abcd SRA2SM4PL136BULTASS7QQNLBLIPE8AM NAPTR RRSIG +sra2sm4pl136bultass7qqnlblipe8am.test.com. 86400 IN NSEC3 1 1 1 abcd U02UTT5Q2BHJCQ986F05MBAP0PGAMT5O CNAME RRSIG +test.com. 86400 IN NSEC3PARAM 1 0 1 abcd +u02utt5q2bhjcq986f05mbap0pgamt5o.test.com. 86400 IN NSEC3 1 1 1 abcd VLVUJATANOF6FEAJOESTI9KQ4S0CRST3 A RRSIG +vlvujatanof6feajoesti9kq4s0crst3.test.com. 86400 IN NSEC3 1 1 1 abcd 0BH8DI769I8VVTKDDS8EFJDA19ABIGO5