diff --git a/CHANGES b/CHANGES index 991ad92bee..61218457a4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +2945. [doc] Update empty-zones list in ARM. [RT #21772] + +2944. [maint] Remove ORCHID prefix from built in empty zones. + [RT #21772] + --- 9.7.2rc1 released --- 2943. [func] Add support to load new keys into managed zones diff --git a/bin/named/server.c b/bin/named/server.c index 3e9a1a7f96..50dc380800 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: server.c,v 1.556.8.25 2010/08/16 23:46:30 tbox Exp $ */ +/* $Id: server.c,v 1.556.8.26 2010/08/20 00:17:40 marka Exp $ */ /*! \file */ @@ -265,9 +265,6 @@ static const struct { /* Example Prefix, RFC 3849. */ { "8.B.D.0.1.0.0.2.IP6.ARPA", ISC_FALSE }, - /* ORCHID Prefix, RFC 4843. */ - { "0.1.1.0.0.2.IP6.ARPA", ISC_FALSE }, - { NULL, ISC_FALSE } }; diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml index 44c3d3b511..6f46ec4d65 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -18,7 +18,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> - + BIND 9 Administrator Reference Manual @@ -8737,9 +8737,12 @@ XXX: end of RFC1918 addresses #defined out --> 127.IN-ADDR.ARPA 254.169.IN-ADDR.ARPA 2.0.192.IN-ADDR.ARPA + 100.51.198.IN-ADDR.ARPA + 113.0.203.IN-ADDR.ARPA 255.255.255.255.IN-ADDR.ARPA 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 1.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 + 8.B.D.0.1.0.0.2.IP6.ARPA D.F.IP6.ARPA 8.E.F.IP6.ARPA 9.E.F.IP6.ARPA