3136. [func] Add RFC 1918 reverse zones to the list of built-in

			empty zones switched on by the 'empty-zones-enable'
			option. [RT #24990]

diff --git a/CHANGES b/CHANGES
index 99ccfe9ab91af06d137be3e3d96db5bc34041b71..93beab7e845ac2f1842be4d7bcc44a4ece343f32 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 3138.  [bug]           Address memory leaks and out-of-order operations when
                        shutting named down. [RT #25210]
 
+3136.  [func]          Add RFC 1918 reverse zones to the list of built-in 
+                       empty zones switched on by the 'empty-zones-enable'
+                       option. [RT #24990]
+
 3135.  [port]          FreeBSD: workaround broken IPV6_USE_MIN_MTU processing.
                        See http://www.freebsd.org/cgi/query-pr.cgi?pr=158307
                        [RT #24950]

diff --git a/bin/named/server.c b/bin/named/server.c
index b4cf8308dbc8df070aac90cb3c5a1545f5e1f50f..94d022c1e821ba7be221f98d9a055d9b9a1f6908 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.599.8.11 2011/07/08 23:47:14 tbox Exp $ */
+/* $Id: server.c,v 1.599.8.12 2011/08/02 04:58:45 each Exp $ */
 
 /*! \file */
 
@@ -222,7 +222,6 @@ static const struct {
        const char      *zone;
        isc_boolean_t   rfc1918;
 } empty_zones[] = {
-#ifdef notyet
        /* RFC 1918 */
        { "10.IN-ADDR.ARPA", ISC_TRUE },
        { "16.172.IN-ADDR.ARPA", ISC_TRUE },
@@ -242,7 +241,6 @@ static const struct {
        { "30.172.IN-ADDR.ARPA", ISC_TRUE },
        { "31.172.IN-ADDR.ARPA", ISC_TRUE },
        { "168.192.IN-ADDR.ARPA", ISC_TRUE },
-#endif
 
        /* RFC 5735 and RFC 5737 */
        { "0.IN-ADDR.ARPA", ISC_FALSE },        /* THIS NETWORK */

diff --git a/bin/tests/system/resolver/ns7/named.conf b/bin/tests/system/resolver/ns7/named.conf
index a4c81de67f53e8373ee27bd02f57ee30aac583e7..f349e697ef3086daa1b704dd2ed8583a7ca3a2ea 100644 (file)
--- a/bin/tests/system/resolver/ns7/named.conf
+++ b/bin/tests/system/resolver/ns7/named.conf
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2.50.2 2011/03/13 23:47:14 tbox Exp $ */
+/* $Id: named.conf,v 1.2.50.3 2011/08/02 04:58:46 each Exp $ */
 
 // NS4
 
@@ -29,6 +29,8 @@ options {
        listen-on { 10.53.0.7; };
        listen-on-v6 { none; };
        recursion yes;
+       empty-zones-enable yes;
+       disable-empty-zone 20.172.in-addr.arpa;
 };
 
 zone "." {

diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 4e791b2cd14ee29eb3ca6d7b490e064555118234..bfc91ee5616e1f8b1f5e98563b90940a83e4ae3d 100644 (file)
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.17.38.2 2011/03/13 23:47:13 tbox Exp $
+# $Id: tests.sh,v 1.17.38.3 2011/08/02 04:58:46 each Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -220,6 +220,50 @@ grep "From NS 4" dig.ns7.bar.${n} > /dev/null || ret=1
 
 if [ $ret != 0 ]; then echo "I:failed"; status=1; fi
 
+n=`expr $n + 1`
+echo "I:checking empty RFC 1918 reverse zones ($n)"
+ret=0
+# Check that "aa" is being set by the resolver for RFC 1918 zones
+# except the one that has been deliberately disabled
+$DIG @10.53.0.7 -p 5300 -x 10.1.1.1 > dig.ns4.out.1.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.1.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 192.168.1.1 > dig.ns4.out.2.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.2.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.16.1.1  > dig.ns4.out.3.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.3.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.17.1.1 > dig.ns4.out.4.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.4.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.18.1.1 > dig.ns4.out.5.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.5.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.19.1.1 > dig.ns4.out.6.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.6.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.21.1.1 > dig.ns4.out.7.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.7.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.22.1.1 > dig.ns4.out.8.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.8.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.23.1.1 > dig.ns4.out.9.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.9.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.24.1.1 > dig.ns4.out.11.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.11.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.25.1.1 > dig.ns4.out.12.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.12.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.26.1.1 > dig.ns4.out.13.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.13.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.27.1.1 > dig.ns4.out.14.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.14.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.28.1.1 > dig.ns4.out.15.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.15.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.29.1.1 > dig.ns4.out.16.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.16.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.30.1.1 > dig.ns4.out.17.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.17.${n} > /dev/null || ret=1
+$DIG @10.53.0.7 -p 5300 -x 172.31.1.1 > dig.ns4.out.18.${n} || ret=1
+grep 'flags: qr aa rd ra;' dig.ns4.out.18.${n} > /dev/null || ret=1
+# but this one should NOT be authoritative
+$DIG @10.53.0.7 -p 5300 -x 172.20.1.1 > dig.ns4.out.19.${n} || ret=1
+grep 'flags: qr rd ra;' dig.ns4.out.19.${n} > /dev/null || ret=1
+if [ $ret != 0 ]; then echo "I:failed"; status=1; fi
+
 echo "I:exit status: $status"
 
 exit $status

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 97764308a86b3f14b6609add650c62764697c379..41b2c54321a5d6bb9da1f208f91b594dc43e998b 100644 (file)
--- 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.478.8.10 2011/06/21 05:32:20 marka Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.478.8.11 2011/08/02 04:58:46 each Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -8866,7 +8866,6 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
          <para>
            The current list of empty zones is:
            <itemizedlist>
-<!-- XXX: The RFC1918 addresses are #defined out in sources currently.
              <listitem>10.IN-ADDR.ARPA</listitem>
              <listitem>16.172.IN-ADDR.ARPA</listitem>
              <listitem>17.172.IN-ADDR.ARPA</listitem>
@@ -8885,7 +8884,6 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
              <listitem>30.172.IN-ADDR.ARPA</listitem>
              <listitem>31.172.IN-ADDR.ARPA</listitem>
              <listitem>168.192.IN-ADDR.ARPA</listitem>
-XXX: end of RFC1918 addresses #defined out -->
              <listitem>0.IN-ADDR.ARPA</listitem>
              <listitem>127.IN-ADDR.ARPA</listitem>
              <listitem>254.169.IN-ADDR.ARPA</listitem>