From: Mark Andrews <marka@isc.org>
Date: Thu, 14 Nov 2013 23:38:18 +0000 (+1100)
Subject: update
X-Git-Tag: v9.10.0a1~16^2~1
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=fedd407a76adfdd745eb7d2461673693c6f9fea9;p=thirdparty%2Fbind9.git

update
---

diff --git a/util/copyrights b/util/copyrights
index ad3495eec89..6732bec6651 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -701,6 +701,8 @@
 ./bin/tests/system/checkconf/bad-dnssec.conf	CONF-C	2012,2013
 ./bin/tests/system/checkconf/bad-inline-slave.conf	CONF-C	2013
 ./bin/tests/system/checkconf/bad-many.conf	CONF-C	2005,2012
+./bin/tests/system/checkconf/bad-sharedzone1.conf	CONF-C	2013
+./bin/tests/system/checkconf/bad-sharedzone2.conf	CONF-C	2013
 ./bin/tests/system/checkconf/bad-tsig.conf	CONF-C	2012,2013
 ./bin/tests/system/checkconf/clean.sh		SH	2011,2012
 ./bin/tests/system/checkconf/dlz-bad.conf	CONF-C	2012,2013
@@ -1624,21 +1626,25 @@
 ./bin/tests/system/verify/tests.sh		SH	2012,2013
 ./bin/tests/system/verify/zones/genzones.sh	SH	2012,2013
 ./bin/tests/system/verify/zones/unsigned.db	ZONE	2012
-./bin/tests/system/views/clean.sh		SH	2000,2001,2004,2005,2007,2012
+./bin/tests/system/views/clean.sh		SH	2000,2001,2004,2005,2007,2012,2013
 ./bin/tests/system/views/ns1/named.conf		CONF-C	2000,2001,2004,2007
 ./bin/tests/system/views/ns1/root.db		ZONE	2000,2001,2004,2007
 ./bin/tests/system/views/ns2/.gitignore		X	2012
+./bin/tests/system/views/ns2/clone.db		ZONE	2013
 ./bin/tests/system/views/ns2/example1.db	ZONE	2000,2001,2004,2007
 ./bin/tests/system/views/ns2/example2.db	ZONE	2000,2001,2004,2007
 ./bin/tests/system/views/ns2/internal.db	ZONE	2000,2001,2004,2007
-./bin/tests/system/views/ns2/named1.conf	CONF-C	2000,2001,2004,2007
-./bin/tests/system/views/ns2/named2.conf	CONF-C	2000,2001,2004,2007
+./bin/tests/system/views/ns2/named1.conf	CONF-C	2000,2001,2004,2007,2013
+./bin/tests/system/views/ns2/named2.conf	CONF-C	2000,2001,2004,2007,2013
 ./bin/tests/system/views/ns3/.gitignore		X	2012
+./bin/tests/system/views/ns3/child.clone.db	ZONE	2013
 ./bin/tests/system/views/ns3/internal.db	ZONE	2000,2001,2004,2007
 ./bin/tests/system/views/ns3/named1.conf	CONF-C	2000,2001,2004,2007,2013
 ./bin/tests/system/views/ns3/named2.conf	CONF-C	2000,2001,2004,2007,2013
+./bin/tests/system/views/ns4/child.clone.db	ZONE	2013
+./bin/tests/system/views/ns4/named.conf		CONF-C	2013
 ./bin/tests/system/views/setup.sh		SH	2000,2001,2004,2007,2012
-./bin/tests/system/views/tests.sh		SH	2000,2001,2004,2007,2012
+./bin/tests/system/views/tests.sh		SH	2000,2001,2004,2007,2012,2013
 ./bin/tests/system/wildcard/clean.sh		SH	2012,2013
 ./bin/tests/system/wildcard/ns1/dlv.db.in	ZONE	2013
 ./bin/tests/system/wildcard/ns1/named.conf	CONF-C	2012,2013
@@ -2832,7 +2838,7 @@
 ./lib/dns/xfrin.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2013
 ./lib/dns/zone.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./lib/dns/zonekey.c				C	2001,2003,2004,2005,2007
-./lib/dns/zt.c					C	1999,2000,2001,2002,2004,2005,2006,2007,2011,2012
+./lib/dns/zt.c					C	1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013
 ./lib/irs/Makefile.in				MAKE	2009,2012
 ./lib/irs/api					X	2009,2010,2011,2012,2013
 ./lib/irs/context.c				C	2009
@@ -2958,7 +2964,7 @@
 ./lib/isc/include/isc/stdio.h			C	2000,2001,2004,2005,2006,2007,2013
 ./lib/isc/include/isc/stdlib.h			C	2003,2004,2005,2006,2007
 ./lib/isc/include/isc/string.h			C	2000,2001,2003,2004,2005,2006,2007
-./lib/isc/include/isc/symtab.h			C	1996,1997,1998,1999,2000,2001,2004,2005,2006,2007,2009,2011,2012
+./lib/isc/include/isc/symtab.h			C	1996,1997,1998,1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2013
 ./lib/isc/include/isc/task.h			C	1998,1999,2000,2001,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013
 ./lib/isc/include/isc/taskpool.h		C	1999,2000,2001,2004,2005,2006,2007,2011,2012
 ./lib/isc/include/isc/timer.h			C	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2012,2013