From: Mark Andrews <marka@isc.org>
Date: Fri, 20 Aug 2010 00:13:26 +0000 (+0000)
Subject: 2945.   [doc]           Update empty-zones list in ARM. [RT #21772]
X-Git-Tag: v9.8.0-P1~484
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=38abdbf816fac8386d6f5259d5d6bdfb1b4b3d05;p=thirdparty%2Fbind9.git

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 a783585db6d..b44260b16d4 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]
+
 2943.	[func]		Add support to load new keys into managed zones
 			without signing immediately with "rndc loadkeys".
 			Add support to link keys with "dnssec-keygen -S"
diff --git a/bin/named/server.c b/bin/named/server.c
index 0b5b129daaf..2361c6f8318 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.581 2010/08/16 23:46:51 tbox Exp $ */
+/* $Id: server.c,v 1.582 2010/08/20 00:13:26 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 459b8d7c09a..e7c8f48121b 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.462 2010/08/16 22:21:06 marka Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.463 2010/08/20 00:13:26 marka Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -8737,9 +8737,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>