regenerate

using automatic empty zones from regular zones.
                        [RT #35177]

(cherry picked from commit db8938c993)

CHANGES

@@ -1,3 +1,14 @@
+	--- 9.6-ESV-R11rc2 released ---
+
+3710.	[bug]		Address double dns_zone_detach when switching to
+			using automatic empty zones from regular zones.
+			[RT #35177]
+
+3706.	[contrib]	queryperf: Fixed a possible integer overflow when
+			printing results. [RT #35182]
+
+3704.	[protocol]	Accept integer timestamps in RRSIG records. [RT #35185]
+
 	--- 9.6-ESV-R11rc1 released ---
 
 3698.	[cleanup]	Replaced all uses of memcpy() with memmove().
@@ -12,7 +23,8 @@
 3693.	[security]	memcpy was incorrectly called with overlapping
 			ranges resulting in malformed names being generated
 			on some platforms.  This could cause INSIST failures
-			when serving NSEC3 signed zones.  [RT #35120]
+			when serving NSEC3 signed zones (CVE-2014-0591).
+			[RT #35120]
 
 3692.	[bug]		Two calls to dns_db_getoriginnode were fatal if there
 			was no data at the node. [RT #35080]
@@ -55,8 +67,10 @@
 3658.	[port]		linux: Address platform specific compilation issue
 			when libcap-devel is installed. [RT #34838]
 
-3656.	[bug]		Treat an all zero netmask as invalid when generating
-			the localnets acl. [RT #34687]
+3656.	[security]	Treat an all zero netmask as invalid when generating
+			the localnets acl. (The prior behavior could
+			allow unexpected matches when using some versions
+			of Winsock: CVE-2013-6320.) [RT #34687]
 
 3655.	[cleanup]	Simplify TCP message processing when requesting a
 			zone transfer.  [RT #34825]

Makefile.in

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2009, 2011-2014  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

README

@@ -51,8 +51,9 @@ BIND 9
 BIND 9.6-ESV-R11 (Extended Support Version)
  
 	BIND 9.6-ESV-R11 is a maintenance release, fixing bugs in
-	BIND 9.6-ESV-R10, and also includes the following functional
-	enhancement:
+	BIND 9.6-ESV-R10, and patches the security flaws described
+	in CVE-2013-6320 and CVE-2014-0591. It also includes the
+	following functional enhancement:
 
 	 - "named" now preserves the capitalization of names when
 	    responding to queries.

bin/named/server.c

@@ -990,26 +990,22 @@ on_disable_list(const cfg_obj_t *disablelist, dns_name_t *zonename) {
 	return (ISC_FALSE);
 }
 
-static void
-check_dbtype(dns_zone_t **zonep, unsigned int dbtypec, const char **dbargv,
+static isc_result_t
+check_dbtype(dns_zone_t *zone, unsigned int dbtypec, const char **dbargv,
 	     isc_mem_t *mctx)
 {
 	char **argv = NULL;
 	unsigned int i;
-	isc_result_t result;
+	isc_result_t result = ISC_R_SUCCESS;
 
-	result = dns_zone_getdbtype(*zonep, &argv, mctx);
-	if (result != ISC_R_SUCCESS) {
-		dns_zone_detach(zonep);
-		return;
-	}
+	CHECK(dns_zone_getdbtype(zone, &argv, mctx));
 
 	/*
 	 * Check that all the arguments match.
 	 */
 	for (i = 0; i < dbtypec; i++)
 		if (argv[i] == NULL || strcmp(argv[i], dbargv[i]) != 0) {
-			dns_zone_detach(zonep);
+			CHECK(ISC_R_FAILURE);
 			break;
 		}
 
@@ -1017,8 +1013,11 @@ check_dbtype(dns_zone_t **zonep, unsigned int dbtypec, const char **dbargv,
 	 * Check that there are not extra arguments.
 	 */
 	if (i == dbtypec && argv[i] != NULL)
-		dns_zone_detach(zonep);
+		result = ISC_R_FAILURE;
+
+ cleanup:
 	isc_mem_free(mctx, argv);
+	return (result);
 }
 
 static isc_result_t
@@ -1228,12 +1227,21 @@ create_empty_zone(dns_zone_t *zone, dns_name_t *name, dns_view_t *view,
 	 * Is the existing zone the ok to use?
 	 */
 	if (zone != NULL) {
-		if (db != NULL)
-			check_dbtype(&zone, rbt_dbtypec, rbt_dbtype,
-				     view->mctx);
-		else
-			check_dbtype(&zone, empty_dbtypec, empty_dbtype,
-				     view->mctx);
+		unsigned int typec;
+		const char **dbargv;
+
+		if (db != NULL) {
+			typec = rbt_dbtypec;
+			dbargv = rbt_dbtype;
+		} else {
+			typec = empty_dbtypec;
+			dbargv = empty_dbtype;
+		}
+
+		result = check_dbtype(zone, typec, dbargv, view->mctx);
+		if (result != ISC_R_SUCCESS)
+			zone = NULL;
+
 		if (zone != NULL && dns_zone_gettype(zone) != dns_zone_master)
 			zone = NULL;
 		if (zone != NULL && dns_zone_getfile(zone) != NULL)

bin/tests/system/conf.sh.in

@@ -44,7 +44,9 @@ CHECKCONF=$TOP/bin/check/named-checkconf
 # load on the machine to make it unusable to other users.
 # v6synth
 SUBDIRS="acl additional allow_query builtin cacheclean case checkconf
-	 checknames checkzone database dlv dlz dname dnssec formerr
+	 checknames checkzone database dlv dlz dname dnssec
+	 emptyzones
+	 formerr
 	 forward glue ixfr limits logfileconfig lwresd masterfile
 	 masterformat notify nsupdate pending resolver rndc rrsetorder
 	 spf sortlist stub tkey unknown upforwd views wildcard xfer

bin/tests/system/emptyzones/clean.sh

@@ -0,0 +1 @@
+rm -f ns1/named.conf

bin/tests/system/emptyzones/ns1/empty.db

@@ -0,0 +1,16 @@
+; Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+;
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
+
+@ 0 SOA . . 0 0 0 0 0
+@ 0 NS .

bin/tests/system/emptyzones/ns1/named1.conf

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2004, 2007, 2009, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* $Id: named.conf,v 1.15 2009/05/29 23:47:49 tbox Exp $ */
+
+key rndc_key {
+        algorithm       hmac-sha256;
+        secret          "1234abcd8765";
+};
+
+controls {
+	inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
+};
+
+options {
+	query-source address 10.53.0.1;
+	notify-source 10.53.0.1;
+	transfer-source 10.53.0.1;
+	port 5300;
+	pid-file "named.pid";
+	listen-on { 10.53.0.1; };
+	listen-on-v6 { none; };
+	recursion yes;
+	acache-enable yes;
+	allow-query {!10.53.0.8; any; };
+};
+
+zone "." {
+	type hint;
+	file "root.hint";
+};
+
+include "rfc1918.zones";

bin/tests/system/emptyzones/ns1/named2.conf

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2004, 2007, 2009, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* $Id: named.conf,v 1.15 2009/05/29 23:47:49 tbox Exp $ */
+
+key rndc_key {
+        algorithm       hmac-sha256;
+        secret          "1234abcd8765";
+};
+
+controls {
+	inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
+};
+
+options {
+	query-source address 10.53.0.1;
+	notify-source 10.53.0.1;
+	transfer-source 10.53.0.1;
+	port 5300;
+	pid-file "named.pid";
+	listen-on { 10.53.0.1; };
+	listen-on-v6 { none; };
+	recursion yes;
+	acache-enable yes;
+	allow-query {!10.53.0.8; any; };
+};
+
+zone "." {
+	type hint;
+	file "root.hint";
+};

bin/tests/system/emptyzones/ns1/rfc1918.zones

@@ -0,0 +1,19 @@
+zone "10.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "16.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "17.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "18.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "19.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "20.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "21.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "22.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "23.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "24.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "25.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "26.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "27.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "28.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "29.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "30.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "31.172.IN-ADDR.ARPA" { type master; file "empty.db"; };
+zone "168.192.IN-ADDR.ARPA" { type master; file "empty.db"; };
+

bin/tests/system/emptyzones/ns1/root.hint

@@ -0,0 +1,20 @@
+; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2000, 2001  Internet Software Consortium.
+;
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
+
+; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
+
+$TTL 999999
+.			 IN NS	a.root-servers.nil.
+a.root-servers.nil.	 IN A	10.53.0.2

bin/tests/system/emptyzones/setup.sh

@@ -0,0 +1 @@
+cp -f ns1/named1.conf ns1/named.conf

bin/tests/system/emptyzones/tests.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+status=0
+n=0
+
+n=`expr $n + 1`
+echo "I:check that switching to automatic empty zones works ($n)"
+ret=0
+$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 reload > /dev/null || ret=1
+sleep 5
+cp ns1/named2.conf ns1/named.conf
+$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 reload > /dev/null || ret=1
+sleep 5
+$DIG +vc version.bind txt ch @10.53.0.1 -p 5300 > /dev/null || ret=1
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
+exit $status

bin/tests/system/xfer/prereq.sh

@@ -18,7 +18,13 @@
 
 if $PERL -e 'use Net::DNS;' 2>/dev/null
 then
-    :
+    if $PERL -e 'use Net::DNS; die if $Net::DNS::VERSION == 0.73;' 2>/dev/null
+    then
+        :
+    else
+        echo "I:Net::DNS version 0.73 has a bug that causes this test to fail: please update." >&2
+        exit 1
+    fi
 else
     echo "I:This test requires the Net::DNS library." >&2
     exit 1

contrib/queryperf/queryperf.c

@@ -2170,12 +2170,21 @@ main(int argc, char **argv) {
 	printf("[Status] Processing input data\n");
 
 	while ((sending = keep_sending(&got_eof)) == TRUE ||
-	       queries_outstanding() > 0) {
-		print_interval_statistics();
+	       queries_outstanding() > 0)
+	{
+		if (num_queries_sent_interval > 0){
+			/*
+			 * After statistics are printed, send_query()
+			 * needs to be called at least once so that
+			 * time_of_first_query_interval is reset
+			 */
+			print_interval_statistics();
+		}
 		adjust_rate = FALSE;
 
 		while ((sending = keep_sending(&got_eof)) == TRUE &&
-		       queries_outstanding() < max_queries_outstanding) {
+		       queries_outstanding() < max_queries_outstanding)
+		{
 			int len = next_input_line(input_line, input_length);
 			if (len == 0) {
 				got_eof = TRUE;

lib/dns/api

@@ -5,5 +5,5 @@
 # 9.9: 90-109
 # 9.9-sub: 130-139
 LIBINTERFACE = 114
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 1

lib/dns/rdata/generic/rrsig_46.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2011, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -90,7 +90,20 @@ fromtext_rrsig(ARGS_FROMTEXT) {
 	 */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      ISC_FALSE));
-	RETTOK(dns_time32_fromtext(DNS_AS_STR(token), &time_expire));
+	if (strlen(DNS_AS_STR(token)) <= 10U &&
+	    *DNS_AS_STR(token) != '-' && *DNS_AS_STR(token) != '+') {
+		char *end;
+		unsigned long u;
+		isc_uint64_t u64;
+
+		u64 = u = strtoul(DNS_AS_STR(token), &end, 10);
+		if (u == ULONG_MAX || *end != 0)
+			RETTOK(DNS_R_SYNTAX);
+		if (u64 > 0xffffffffUL)
+			RETTOK(ISC_R_RANGE);
+		time_expire = u;
+	} else
+		RETTOK(dns_time32_fromtext(DNS_AS_STR(token), &time_expire));
 	RETERR(uint32_tobuffer(time_expire, target));
 
 	/*
@@ -98,7 +111,20 @@ fromtext_rrsig(ARGS_FROMTEXT) {
 	 */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      ISC_FALSE));
-	RETTOK(dns_time32_fromtext(DNS_AS_STR(token), &time_signed));
+	if (strlen(DNS_AS_STR(token)) <= 10U &&
+	    *DNS_AS_STR(token) != '-' && *DNS_AS_STR(token) != '+') {
+		char *end;
+		unsigned long u;
+		isc_uint64_t u64;
+
+		u64 = u = strtoul(DNS_AS_STR(token), &end, 10);
+		if (u == ULONG_MAX || *end != 0)
+			RETTOK(DNS_R_SYNTAX);
+		if (u64 > 0xffffffffUL)
+			RETTOK(ISC_R_RANGE);
+		time_signed = u;
+	} else
+		RETTOK(dns_time32_fromtext(DNS_AS_STR(token), &time_signed));
 	RETERR(uint32_tobuffer(time_signed, target));
 
 	/*

lib/isc/api

@@ -5,5 +5,5 @@
 # 9.9: 90-109
 # 9.9-sub: 130-139
 LIBINTERFACE = 110
-LIBREVISION = 1
+LIBREVISION = 2
 LIBAGE = 0

lib/isc/win32/time.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2009, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2009, 2012-2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -91,8 +91,8 @@ isc_time_set(isc_time_t *t, unsigned int seconds, unsigned int nanoseconds) {
 
 	SystemTimeToFileTime(&epoch, &temp);
 
-	i1.LowPart = t->absolute.dwLowDateTime;
-	i1.HighPart = t->absolute.dwHighDateTime;
+	i1.LowPart = temp.dwLowDateTime;
+	i1.HighPart = temp.dwHighDateTime;
 
 	i1.QuadPart += (unsigned __int64)nanoseconds/100;
 	i1.QuadPart += (unsigned __int64)seconds*10000000;

util/copyrights

@@ -6,9 +6,9 @@
 ./FAQ						X	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013
 ./FAQ.xml					SGML	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012,2013
 ./KNOWN-DEFECTS					X	2009
-./Makefile.in					MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013
+./Makefile.in					MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014
 ./NSEC3-NOTES					X	2008,2009
-./README					X	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
+./README					X	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
 ./README.idnkit					X	2005,2009,2012
 ./README.pkcs11					X	2008
 ./acconfig.h					C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2012
@@ -159,7 +159,7 @@
 ./bin/named/named.html				HTML	DOCBOOK
 ./bin/named/notify.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007
 ./bin/named/query.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
-./bin/named/server.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
+./bin/named/server.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
 ./bin/named/sortlist.c				C	2000,2001,2004,2005,2006,2007
 ./bin/named/statschannel.c			C	2008,2009,2010,2011,2012,2013
 ./bin/named/tkeyconf.c				C	1999,2000,2001,2004,2005,2006,2007,2012
@@ -564,7 +564,7 @@
 ./bin/tests/system/common/rndc.conf		CONF-C	2000,2001,2004,2007
 ./bin/tests/system/common/rndc.key		CONF-C	2011,2012
 ./bin/tests/system/common/root.hint		ZONE	2000,2001,2004,2007
-./bin/tests/system/conf.sh.in			SH	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
+./bin/tests/system/conf.sh.in			SH	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
 ./bin/tests/system/database/clean.sh		SH	2011,2012
 ./bin/tests/system/database/ns1/named.conf1	CONF-C	2011,2012
 ./bin/tests/system/database/ns1/named.conf2	CONF-C	2011,2012
@@ -687,6 +687,14 @@
 ./bin/tests/system/dnssec/setup.sh		SH	2000,2001,2004,2007,2010,2012,2013
 ./bin/tests/system/dnssec/signer/example.db.in	ZONE	2010,2012
 ./bin/tests/system/dnssec/tests.sh		SH	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
+./bin/tests/system/emptyzones/clean.sh		SH	2014
+./bin/tests/system/emptyzones/ns1/empty.db	ZONE	2014
+./bin/tests/system/emptyzones/ns1/named1.conf	CONF-C	2014
+./bin/tests/system/emptyzones/ns1/named2.conf	CONF-C	2014
+./bin/tests/system/emptyzones/ns1/rfc1918.zones	CONF-C	2014
+./bin/tests/system/emptyzones/ns1/root.hint	ZONE	2014
+./bin/tests/system/emptyzones/setup.sh		SH	2014
+./bin/tests/system/emptyzones/tests.sh		SH	2014
 ./bin/tests/system/formerr/clean.sh		SH	2013
 ./bin/tests/system/formerr/formerr.pl		PERL	2013
 ./bin/tests/system/formerr/nametoolong		X	2013
@@ -1044,7 +1052,7 @@
 ./bin/tests/system/xfer/ns4/root.db.in		ZONE	2011,2012
 ./bin/tests/system/xfer/ns6/named.conf		CONF-C	2011,2012
 ./bin/tests/system/xfer/ns7/named.conf		CONF-C	2011,2012
-./bin/tests/system/xfer/prereq.sh		SH	2011,2012
+./bin/tests/system/xfer/prereq.sh		SH	2011,2012,2014
 ./bin/tests/system/xfer/setup.sh		SH	2001,2002,2004,2007,2011,2012
 ./bin/tests/system/xfer/tests.sh		SH	2000,2001,2004,2005,2007,2011,2012,2013
 ./bin/tests/system/xferquota/clean.sh		SH	2000,2001,2004,2007,2012
@@ -1402,7 +1410,7 @@
 ./contrib/queryperf/missing/addrinfo.h		X	2004
 ./contrib/queryperf/missing/getaddrinfo.c	X	2004
 ./contrib/queryperf/missing/getnameinfo.c	X	2004
-./contrib/queryperf/queryperf.c			X	2001,2002,2003,2004,2005,2007,2012,2013
+./contrib/queryperf/queryperf.c			X	2001,2002,2003,2004,2005,2007,2012,2013,2014
 ./contrib/queryperf/utils/gen-data-queryperf.py	X	2003,2008
 ./contrib/sdb/bdb/README			X	2002
 ./contrib/sdb/bdb/bdb.c				X	2002,2012
@@ -1639,7 +1647,7 @@
 ./doc/arm/Bv9ARM.ch09.html			X	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./doc/arm/Bv9ARM.ch10.html			X	2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./doc/arm/Bv9ARM.html				X	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
-./doc/arm/Bv9ARM.pdf				X	2007,2008,2009,2010,2011,2012,2013
+./doc/arm/Bv9ARM.pdf				X	2007,2008,2009,2010,2011,2012,2013,2014
 ./doc/arm/Makefile.in				MAKE	2001,2002,2004,2005,2006,2007,2009,2012
 ./doc/arm/README-SGML				TXT.BRIEF	2000,2001,2004
 ./doc/arm/isc-logo.eps				X	2005,2010
@@ -1742,7 +1750,7 @@
 ./lib/Atffile					X	2011
 ./lib/Makefile.in				MAKE	1998,1999,2000,2001,2003,2004,2007,2012,2013
 ./lib/bind9/Makefile.in				MAKE	2001,2004,2007,2012
-./lib/bind9/api					X	2001,2006,2008,2009,2010,2011,2012,2013
+./lib/bind9/api					X	2001,2006,2008,2009,2010,2011,2012,2013,2014
 ./lib/bind9/check.c				C	2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014
 ./lib/bind9/getaddresses.c			C	2001,2002,2004,2005,2007
 ./lib/bind9/include/Makefile.in			MAKE	2001,2004,2007,2012
@@ -1978,7 +1986,7 @@
 ./lib/dns/rdata/generic/ptr_12.h		C	1998,1999,2000,2001,2004,2005,2007
 ./lib/dns/rdata/generic/rp_17.c			C	1999,2000,2001,2004,2005,2007,2012
 ./lib/dns/rdata/generic/rp_17.h			C	1999,2000,2001,2004,2005,2007
-./lib/dns/rdata/generic/rrsig_46.c		C	2003,2004,2005,2007,2011,2012
+./lib/dns/rdata/generic/rrsig_46.c		C	2003,2004,2005,2007,2011,2012,2014
 ./lib/dns/rdata/generic/rrsig_46.h		C	2003,2004,2005,2007
 ./lib/dns/rdata/generic/rt_21.c			C	1999,2000,2001,2003,2004,2005,2007,2012,2014
 ./lib/dns/rdata/generic/rt_21.h			C	1999,2000,2001,2004,2005,2007
@@ -2108,7 +2116,7 @@
 ./lib/isc/alpha/include/Makefile.in		MAKE	2007,2012
 ./lib/isc/alpha/include/isc/Makefile.in		MAKE	2007,2012
 ./lib/isc/alpha/include/isc/atomic.h		C	2005,2007,2009,2012
-./lib/isc/api					X	1999,2000,2001,2006,2008,2009,2010,2011,2012,2013
+./lib/isc/api					X	1999,2000,2001,2006,2008,2009,2010,2011,2012,2013,2014
 ./lib/isc/assertions.c				C	1997,1998,1999,2000,2001,2004,2005,2007,2008,2011,2012
 ./lib/isc/base32.c				C	2008,2009,2012,2014
 ./lib/isc/base64.c				C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2012,2014
@@ -2386,7 +2394,7 @@
 ./lib/isc/win32/syslog.c			C	2001,2002,2003,2004,2007
 ./lib/isc/win32/syslog.h			C	2001,2002,2004,2007
 ./lib/isc/win32/thread.c			C	1998,1999,2000,2001,2004,2005,2007
-./lib/isc/win32/time.c				C	1998,1999,2000,2001,2003,2004,2006,2007,2008,2009,2012,2013
+./lib/isc/win32/time.c				C	1998,1999,2000,2001,2003,2004,2006,2007,2008,2009,2012,2013,2014
 ./lib/isc/win32/unistd.h			C	2000,2001,2004,2007,2008,2012
 ./lib/isc/win32/version.c			C	1998,1999,2000,2001,2004,2007
 ./lib/isc/win32/win32os.c			C	2002,2004,2007,2013
@@ -2400,7 +2408,7 @@
 ./lib/isc/x86_64/include/isc/atomic.h		C	2005,2007,2008
 ./lib/isccc/Makefile.in				MAKE	2001,2003,2004,2007,2011,2012
 ./lib/isccc/alist.c				C.NOM	2001,2004,2005,2007
-./lib/isccc/api					X	2001,2006,2008,2009,2012,2013
+./lib/isccc/api					X	2001,2006,2008,2009,2012,2013,2014
 ./lib/isccc/base64.c				C.NOM	2001,2004,2005,2007
 ./lib/isccc/cc.c				C.NOM	2001,2002,2003,2004,2005,2006,2007,2012,2013
 ./lib/isccc/ccmsg.c				C.NOM	2001,2004,2005,2007
@@ -2432,7 +2440,7 @@
 ./lib/isccc/win32/version.c			C	2001,2004,2007
 ./lib/isccfg/Makefile.in			MAKE	2001,2002,2003,2004,2005,2007,2011,2012
 ./lib/isccfg/aclconf.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2012
-./lib/isccfg/api				X	2001,2006,2008,2009,2010,2011,2012,2013
+./lib/isccfg/api				X	2001,2006,2008,2009,2010,2011,2012,2013,2014
 ./lib/isccfg/include/Makefile.in		MAKE	2001,2004,2007,2012
 ./lib/isccfg/include/isccfg/Makefile.in		MAKE	2001,2002,2004,2005,2007,2012
 ./lib/isccfg/include/isccfg/aclconf.h		C	1999,2000,2001,2004,2005,2006,2007,2012
@@ -2452,7 +2460,7 @@
 ./lib/isccfg/win32/libisccfg.mak		X	2001,2002,2004,2005,2006,2009
 ./lib/isccfg/win32/version.c			C	1998,1999,2000,2001,2004,2007
 ./lib/lwres/Makefile.in				MAKE	2000,2001,2004,2005,2007,2012
-./lib/lwres/api					X	2000,2001,2006,2008,2009,2011,2012,2013
+./lib/lwres/api					X	2000,2001,2006,2008,2009,2011,2012,2013,2014
 ./lib/lwres/assert_p.h				C	2000,2001,2004,2005,2007,2011,2012
 ./lib/lwres/context.c				C	2000,2001,2003,2004,2005,2007,2008,2009,2012,2014
 ./lib/lwres/context_p.h				C	2000,2001,2004,2005,2007,2008,2012
@@ -2925,7 +2933,7 @@
 ./util/update_branches				PERL	2005,2007,2012
 ./util/update_copyrights			PERL	1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2010,2012,2013
 ./util/xc					SH	2012,2013
-./version					X	1998,1999,2000,2001,2003,2005,2006,2007,2008,2009,2010,2011,2012,2013
+./version					X	1998,1999,2000,2001,2003,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
 ./win32utils/BINDBuild.dsw			X	2001,2005,2006,2008,2010
 ./win32utils/BuildAll.bat			BAT	2001,2002,2004,2005,2006,2007,2008
 ./win32utils/BuildOpenSSL.bat			BAT	2007,2011

version

@@ -9,5 +9,5 @@ MAJORVER=9
 MINORVER=6
 PATCHVER=
 RELEASETYPE=-ESV
-RELEASEVER=-R11rc1
+RELEASEVER=-R11rc2
 EXTENSIONS=