2891. [maint] Update empty-zones list to match

                        draft-ietf-dnsop-default-local-zones-13. [RT# 21099]

diff --git a/CHANGES b/CHANGES
index c93459a14c3853467a192d6a0603d369d2c5c488..29ca511223bb30aefe26c95fceb129db7c94d079 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2891.  [maint]         Update empty-zones list to match
+                       draft-ietf-dnsop-default-local-zones-13. [RT# 21099]
+
 2890.  [bug]           Handle the introduction of new trusted-keys and
                        DS, DLV RRsets better. [RT #21097]
 

diff --git a/bin/named/server.c b/bin/named/server.c
index 436ce6301919c94f75ad85a331032e03edd48aaa..023231ec003e355461ba1b21bb9f1ffa667c3ee8 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.564 2010/03/04 06:17:01 marka Exp $ */
+/* $Id: server.c,v 1.565 2010/05/14 03:24:24 marka Exp $ */
 
 /*! \file */
 
@@ -223,11 +223,13 @@ static const struct {
        { "168.192.IN-ADDR.ARPA", ISC_TRUE },
 #endif
 
-       /* RFC 3330 */
+       /* RFC 5735 and RFC 5737 */
        { "0.IN-ADDR.ARPA", ISC_FALSE },        /* THIS NETWORK */
        { "127.IN-ADDR.ARPA", ISC_FALSE },      /* LOOPBACK */
        { "254.169.IN-ADDR.ARPA", ISC_FALSE },  /* LINK LOCAL */
        { "2.0.192.IN-ADDR.ARPA", ISC_FALSE },  /* TEST NET */
+       { "100.51.198.IN-ADDR.ARPA", ISC_FALSE },       /* TEST NET 2 */
+       { "113.0.203.IN-ADDR.ARPA", ISC_FALSE },        /* TEST NET 3 */
        { "255.255.255.255.IN-ADDR.ARPA", ISC_FALSE },  /* BROADCAST */
 
        /* Local IPv6 Unicast Addresses */
@@ -240,6 +242,12 @@ static const struct {
        { "A.E.F.IP6.ARPA", ISC_FALSE },        /* LINK LOCAL */
        { "B.E.F.IP6.ARPA", ISC_FALSE },        /* LINK LOCAL */
 
+       /* 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 }
 };