- Conforms to draft-ietf-dnsop-default-local-zones-13. Added default

  reverse lookup blocks for IPv4 test nets 100.51.198.in-addr.arpa,
  113.0.203.in-addr.arpa and Orchid prefix 0.1.1.0.0.2.ip6.arpa.

git-svn-id: file:///svn/unbound/trunk@2108 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 5686276e87260bbf336c5e59b1d58d0e01355cf8..b8a46e6c025869cb5fa9784564f4aecce5c8fee6 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,8 @@
 4 May 2010: Wouter
        - Fix dnssec-missing detection that was turned off by server selection.
+       - Conforms to draft-ietf-dnsop-default-local-zones-13.  Added default
+         reverse lookup blocks for IPv4 test nets 100.51.198.in-addr.arpa,
+         113.0.203.in-addr.arpa and Orchid prefix 0.1.1.0.0.2.ip6.arpa.
 
 29 April 2010: Wouter
        - Fix for dnssec lameness detection to use the key cache.

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 16a607c93a2a1006d1a758f3f5aafd3a13180987..40b4bad8d53fe92e4220bcdc712dba61072830ef 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -778,7 +778,8 @@ records are provided.
 .TP 10
 \h'5'\fIreverse RFC3330 IP4 this, link\-local, testnet and broadcast\fR 
 Reverse data for zones 0.in\-addr.arpa, 254.169.in\-addr.arpa, 
-2.0.192.in\-addr.arpa, 255.255.255.255.in\-addr.arpa.
+2.0.192.in\-addr.arpa (TEST NET 1), 100.51.198.in\-addr.arpa (TEST NET 2),
+113.0.203.in\-addr.arpa (TEST NET 3), 255.255.255.255.in\-addr.arpa.
 .TP 10
 \h'5'\fIreverse RFC4291 IP6 unspecified\fR
 Reverse data for zone 
@@ -793,12 +794,17 @@ Reverse data for zone D.F.ip6.arpa.
 \h'5'\fIreverse RFC4291 IPv6 Link Local Addresses\fR
 Reverse data for zones 8.E.F.ip6.arpa to B.E.F.ip6.arpa.
 .TP 10
+\h'5'\fIreverse RFC4843 Orchid Prefix\fR
+Reverse data for zone 0.1.1.0.0.2.ip6.arpa.
+.TP 10
 \h'5'\fIreverse IPv6 Example Prefix\fR
 Reverse data for zone 8.B.D.0.1.0.0.2.ip6.arpa. This zone is used for
 tutorials and examples. You can remove the block on this zone with:
 .nf
   local\-zone: 8.B.D.0.1.0.0.2.ip6.arpa. nodefault
 .fi
+You can also selectively unblock a part of the zone by making that part
+transparent with a local\-zone statement.
 This also works with the other default zones.
 .\" End of local-zone listing.
 .TP 5

diff --git a/services/localzone.c b/services/localzone.c
index b8da77aa6bd3c3c309879e1477d70a48c1f87ec8..248d45f9b4a46d366a29432a181ddbe33142afb0 100644 (file)
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -689,6 +689,8 @@ lz_enter_defaults(struct local_zones* zones, struct config_file* cfg,
                !add_as112_default(zones, cfg, buf, "0.in-addr.arpa.") ||
                !add_as112_default(zones, cfg, buf, "254.169.in-addr.arpa.") ||
                !add_as112_default(zones, cfg, buf, "2.0.192.in-addr.arpa.") ||
+               !add_as112_default(zones, cfg, buf, "100.51.198.in-addr.arpa.") ||
+               !add_as112_default(zones, cfg, buf, "113.0.203.in-addr.arpa.") ||
                !add_as112_default(zones, cfg, buf, "255.255.255.255.in-addr.arpa.") ||
                !add_as112_default(zones, cfg, buf, "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa.") ||
                !add_as112_default(zones, cfg, buf, "d.f.ip6.arpa.") ||
@@ -696,6 +698,7 @@ lz_enter_defaults(struct local_zones* zones, struct config_file* cfg,
                !add_as112_default(zones, cfg, buf, "9.e.f.ip6.arpa.") ||
                !add_as112_default(zones, cfg, buf, "a.e.f.ip6.arpa.") ||
                !add_as112_default(zones, cfg, buf, "b.e.f.ip6.arpa.") ||
+               !add_as112_default(zones, cfg, buf, "0.1.1.0.0.2.ip6.arpa.") ||
                !add_as112_default(zones, cfg, buf, "8.b.d.0.1.0.0.2.ip6.arpa.")) {
                log_err("out of memory adding default zone");
                return 0;