- compliance with draft-ietf-dnsop-default-local-zones-14, removed

  reverse ipv6 orchid prefix from builtin list.

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

diff --git a/doc/Changelog b/doc/Changelog
index 98d128fdb23d792172ffc38752db6ddc616c2157..e9e5a5f83240c0f9a52b109cef552756931f126b 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+22 September 2010: Wouter
+       - compliance with draft-ietf-dnsop-default-local-zones-14, removed
+         reverse ipv6 orchid prefix from builtin list.
+
 17 September 2010: Wouter
        - DLV has downgrade protection again, because the RFC says so.
        - iana portlist updated.

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index f75ebc97e8a9d327543c39273692b3af6c7350f4..49eeb7cbe5a0e32883e737ac661fb229686ad857 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -803,9 +803,6 @@ 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:

diff --git a/services/localzone.c b/services/localzone.c
index 452d043e9ba8af460077a2ca506f37d85fd875aa..c1ad4d2d9564fdd9d2f391c0e1448c97374438c4 100644 (file)
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -698,7 +698,6 @@ 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;