2945. [doc] Update empty-zones list in ARM. [RT #21772]

2944.   [maint]         Remove ORCHID prefix from built in empty zones.
                        [RT #21772]

diff --git a/CHANGES b/CHANGES
index e058853fadb30fe4b03fb3d2690503665b9ff467..3d464221085d1ad09a9904b8fe624b18a5b639a2 100644 (file)
--- 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]
+
 2937.  [bug]           Worked around an apparent race condition in over
                        memory conditions.  Without this fix a DNS cache DB or
                        ADB could incorrectly stay in an over memory state,

diff --git a/bin/named/server.c b/bin/named/server.c
index 2e4cc7802b42a363d643dc0c1316ce0f312a7b14..696741909367b370afedf46beb73019f6dab1375 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.495.10.35 2010/05/14 23:46:45 tbox Exp $ */
+/* $Id: server.c,v 1.495.10.36 2010/08/20 00:23:56 marka Exp $ */
 
 /*! \file */
 
@@ -227,9 +227,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 82e8923d1f4388d588e4c1d4f3beb1393640a71e..885bb6db649106b459c71046123d59f3a1db844c 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -35,7 +35,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.340.24.52 2010/07/09 05:16:01 each Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.340.24.53 2010/08/20 00:23:56 marka Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -8036,9 +8036,12 @@ XXX: end of RFC1918 addresses #defined out -->
              <listitem>127.IN-ADDR.ARPA</listitem>
              <listitem>254.169.IN-ADDR.ARPA</listitem>
              <listitem>2.0.192.IN-ADDR.ARPA</listitem>
+             <listitem>100.51.198.IN-ADDR.ARPA</listitem>
+             <listitem>113.0.203.IN-ADDR.ARPA</listitem>
              <listitem>255.255.255.255.IN-ADDR.ARPA</listitem>
              <listitem>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</listitem>
              <listitem>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</listitem>
+             <listitem>8.B.D.0.1.0.0.2.IP6.ARPA</listitem>
              <listitem>D.F.IP6.ARPA</listitem>
              <listitem>8.E.F.IP6.ARPA</listitem>
              <listitem>9.E.F.IP6.ARPA</listitem>