default local zones draft 06.

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

diff --git a/doc/Changelog b/doc/Changelog
index b078977aefe0efeac90f3c89226820859685b77d..3844fd4138e075c83644112dc3a8d3e9173e7c29 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+15 July 2008: Wouter
+       - Follow draft-ietf-dnsop-default-local-zones-06 added reverse
+         IPv6 example prefix to AS112 default blocklist.
+
 3 July 2008: Wouter
        - Matthijs fixed memory leaks in root hints file reading.
 

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 32b5fdcbc40c0f315a046ad48f7d7f66e2ce7de5..b5f6dfb69670b9fa737be665f3a66f7453f9afa7 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -563,6 +563,14 @@ Reverse data for zone D.F.ip6.arpa.
 .TP 10
 \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 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
+This also works with the other default zones.
 .\" End of local-zone listing.
 .TP 5
 .B local\-data: \fI"<resource record string>"

diff --git a/services/localzone.c b/services/localzone.c
index 11d4e6d6b7b230197cea5901fc793791d4e6ccbe..2712bab7a62997eed9eeb2dc304bb60837abcd9d 100644 (file)
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -647,7 +647,8 @@ lz_enter_defaults(struct local_zones* zones, struct config_file* cfg,
                !add_as112_default(zones, cfg, buf, "8.e.f.ip6.arpa.") ||
                !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, "b.e.f.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;
        }