From e676a596869d8a80a644c99a848afb53d1c5975e Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 20 Feb 2014 10:53:11 +1100
Subject: [PATCH] update copyrights

---
 bin/check/check-tool.c                        |  4 +-
 bin/check/check-tool.h                        |  2 +-
 bin/check/named-checkzone.c                   |  2 +-
 bin/check/named-checkzone.docbook             |  3 +-
 bin/named/include/named/client.h              |  2 +-
 bin/named/update.c                            |  2 +-
 bin/tests/system/checkconf/bad-maxttlmap.conf | 10 ++--
 bin/tests/system/checkconf/clean.sh           |  2 +-
 bin/tests/system/checkconf/maxttl-bad.db      |  2 +-
 bin/tests/system/checkconf/maxttl.db          |  2 +-
 bin/tests/system/checkzone/clean.sh           |  2 +-
 bin/tests/system/checkzone/tests.sh           |  2 +-
 bin/tests/system/nsupdate/ns1/max-ttl.db      |  3 +-
 bin/tests/system/nsupdate/ns1/named.conf      |  2 +-
 bin/tests/system/sit/clean.sh                 | 14 +++++
 bin/tests/system/sit/ns1/example.db           | 14 +++++
 bin/tests/system/sit/ns1/named.conf           |  6 +-
 bin/tests/system/sit/ns1/root.hint            |  3 +-
 bin/tests/system/sit/ns2/root.db              | 14 +++++
 bin/tests/system/sit/prereq.sh.in             | 14 +++++
 bin/tests/system/sit/tests.sh                 |  3 +-
 lib/dns/include/dns/adb.h                     |  2 +-
 lib/dns/include/dns/master.h                  |  4 +-
 lib/dns/include/dns/peer.h                    |  2 +-
 lib/dns/include/dns/stats.h                   |  2 +-
 lib/dns/include/dns/zone.h                    |  2 +-
 lib/dns/master.c                              | 10 ++--
 lib/isc/aes.c                                 |  2 +-
 lib/isc/include/isc/aes.h                     |  2 +-
 lib/isc/tests/aes_test.c                      |  4 +-
 util/bindkeys.pl                              |  2 +-
 util/copyrights                               | 57 ++++++++++++-------
 32 files changed, 134 insertions(+), 63 deletions(-)

diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c
index 88223d0077..83ef5e85a1 100644
--- a/bin/check/check-tool.c
+++ b/bin/check/check-tool.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -642,7 +642,7 @@ check_ttls(dns_zone_t *zone, dns_ttl_t maxttl) {
 		if (result == ISC_R_NOMORE)
 			result = ISC_R_SUCCESS;
 		CHECK(result);
-			
+
 		dns_rdatasetiter_destroy(&rdsiter);
 		dns_db_detachnode(db, &node);
 	}
diff --git a/bin/check/check-tool.h b/bin/check/check-tool.h
index 5ea53c483e..2262903e22 100644
--- a/bin/check/check-tool.h
+++ b/bin/check/check-tool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2010, 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2010, 2011, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index b973f79934..598a20e497 100644
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook
index 61baf5f03f..f969eff4f2 100644
--- a/bin/check/named-checkzone.docbook
+++ b/bin/check/named-checkzone.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2007, 2009-2013  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2007, 2009-2014  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2002  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -41,6 +41,7 @@
       <year>2011</year>
       <year>2012</year>
       <year>2013</year>
+      <year>2014</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>
diff --git a/bin/named/include/named/client.h b/bin/named/include/named/client.h
index 870877fa2f..5707d8ec5b 100644
--- a/bin/named/include/named/client.h
+++ b/bin/named/include/named/client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/named/update.c b/bin/named/update.c
index 217603f9ca..fa1136de32 100644
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/tests/system/checkconf/bad-maxttlmap.conf b/bin/tests/system/checkconf/bad-maxttlmap.conf
index 3020287e5e..524a438787 100644
--- a/bin/tests/system/checkconf/bad-maxttlmap.conf
+++ b/bin/tests/system/checkconf/bad-maxttlmap.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * 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
@@ -15,8 +15,8 @@
  */
 
 zone example {
-        type master;
-        masterfile-format map;
-        file "example.db";
-        max-zone-ttl 3600;
+	type master;
+	masterfile-format map;
+	file "example.db";
+	max-zone-ttl 3600;
 };
diff --git a/bin/tests/system/checkconf/clean.sh b/bin/tests/system/checkconf/clean.sh
index 26cffe1a39..772d521d0c 100644
--- a/bin/tests/system/checkconf/clean.sh
+++ b/bin/tests/system/checkconf/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-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
diff --git a/bin/tests/system/checkconf/maxttl-bad.db b/bin/tests/system/checkconf/maxttl-bad.db
index 430f7dce2f..24e4f1084a 100644
--- a/bin/tests/system/checkconf/maxttl-bad.db
+++ b/bin/tests/system/checkconf/maxttl-bad.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+; 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
diff --git a/bin/tests/system/checkconf/maxttl.db b/bin/tests/system/checkconf/maxttl.db
index a8daaa1050..726290d225 100644
--- a/bin/tests/system/checkconf/maxttl.db
+++ b/bin/tests/system/checkconf/maxttl.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+; 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
diff --git a/bin/tests/system/checkzone/clean.sh b/bin/tests/system/checkzone/clean.sh
index b248998f4a..3086f9a111 100644
--- a/bin/tests/system/checkzone/clean.sh
+++ b/bin/tests/system/checkzone/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-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
diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh
index b731767073..c9371d209d 100644
--- a/bin/tests/system/checkzone/tests.sh
+++ b/bin/tests/system/checkzone/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-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
diff --git a/bin/tests/system/nsupdate/ns1/max-ttl.db b/bin/tests/system/nsupdate/ns1/max-ttl.db
index 2f96cdee00..b86714ccdd 100644
--- a/bin/tests/system/nsupdate/ns1/max-ttl.db
+++ b/bin/tests/system/nsupdate/ns1/max-ttl.db
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000-2002  Internet Software Consortium.
+; 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
diff --git a/bin/tests/system/nsupdate/ns1/named.conf b/bin/tests/system/nsupdate/ns1/named.conf
index 41a7b0016e..df99040e5e 100644
--- a/bin/tests/system/nsupdate/ns1/named.conf
+++ b/bin/tests/system/nsupdate/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011-2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/tests/system/sit/clean.sh b/bin/tests/system/sit/clean.sh
index 8f80f3d934..0b4948cdd1 100644
--- a/bin/tests/system/sit/clean.sh
+++ b/bin/tests/system/sit/clean.sh
@@ -1,2 +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.
+
 rm -f dig.out.*
 rm -f ns1/named_dump.db
diff --git a/bin/tests/system/sit/ns1/example.db b/bin/tests/system/sit/ns1/example.db
index 4619d8c4da..c1355fc672 100644
--- a/bin/tests/system/sit/ns1/example.db
+++ b/bin/tests/system/sit/ns1/example.db
@@ -1,3 +1,17 @@
+; 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.
+
 @	SOA	ns1 hostmaster.isc.org. 1 600 600 1200 600
 @ 	NS	ns1
 ns1 	A	10.53.0.1
diff --git a/bin/tests/system/sit/ns1/named.conf b/bin/tests/system/sit/ns1/named.conf
index e43e24fdb0..4686a44d1a 100644
--- a/bin/tests/system/sit/ns1/named.conf
+++ b/bin/tests/system/sit/ns1/named.conf
@@ -15,12 +15,12 @@
  */
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-sha256;
+	secret "1234abcd8765";
+	algorithm hmac-sha256;
 };
 
 controls {
-        inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
+	inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
 };
 
 options {
diff --git a/bin/tests/system/sit/ns1/root.hint b/bin/tests/system/sit/ns1/root.hint
index 2fd180e3ba..d4fa964ba3 100644
--- a/bin/tests/system/sit/ns1/root.hint
+++ b/bin/tests/system/sit/ns1/root.hint
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; 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
diff --git a/bin/tests/system/sit/ns2/root.db b/bin/tests/system/sit/ns2/root.db
index 49f3718a76..06d097964c 100644
--- a/bin/tests/system/sit/ns2/root.db
+++ b/bin/tests/system/sit/ns2/root.db
@@ -1,3 +1,17 @@
+; 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.
+
 @	SOA	a.root-servers.nil. hostmaster.isc.org. 1 600 600 1200 600
 @ 	NS	a.root-servers.nil.
 a.root-servers.nil. A	10.53.0.2
diff --git a/bin/tests/system/sit/prereq.sh.in b/bin/tests/system/sit/prereq.sh.in
index da92848bf2..7003a0ddf0 100644
--- a/bin/tests/system/sit/prereq.sh.in
+++ b/bin/tests/system/sit/prereq.sh.in
@@ -1,2 +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.
+
 test "@HAVE_SIT@" = "" && exit 255
 exit 0
diff --git a/bin/tests/system/sit/tests.sh b/bin/tests/system/sit/tests.sh
index 8173d704cf..eee7c8ec70 100755
--- a/bin/tests/system/sit/tests.sh
+++ b/bin/tests/system/sit/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009-2014  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000, 2001  Internet Software Consortium.
+# 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
diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h
index 4cc8c9edc8..d13943d605 100644
--- a/lib/dns/include/dns/adb.h
+++ b/lib/dns/include/dns/adb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2011, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h
index 998f1a7fac..745381aa7e 100644
--- a/lib/dns/include/dns/master.h
+++ b/lib/dns/include/dns/master.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -262,7 +262,7 @@ dns_master_loadfileinc5(const char *master_file,
 			dns_loaddonefunc_t done, void *done_arg,
 			dns_loadctx_t **ctxp,
 			dns_masterincludecb_t include_cb, void *include_arg,
-			isc_mem_t *mctx, dns_masterformat_t format, 
+			isc_mem_t *mctx, dns_masterformat_t format,
 			isc_uint32_t maxttl);
 
 isc_result_t
diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h
index 619697ceb0..4374db4570 100644
--- a/lib/dns/include/dns/peer.h
+++ b/lib/dns/include/dns/peer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/include/dns/stats.h b/lib/dns/include/dns/stats.h
index eeff364e41..059dcd487f 100644
--- a/lib/dns/include/dns/stats.h
+++ b/lib/dns/include/dns/stats.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index 3b7468463c..ab83ecfdbb 100644
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/master.c b/lib/dns/master.c
index 9ad5d41d55..0300b5035a 100644
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -560,7 +560,7 @@ loadctx_create(dns_masterformat_t format, isc_mem_t *mctx,
 		goto cleanup_ctx;
 
 	lctx->maxttl = 0;
-	
+
 	lctx->format = format;
 	switch (format) {
 	default:
@@ -2404,7 +2404,7 @@ load_raw(dns_loadctx_t *lctx) {
 			(callbacks->error)(callbacks,
 					   "dns_master_load: "
 					   "TTL %d exceeds configured "
-					   "max-zone-ttl %d", 
+					   "max-zone-ttl %d",
 					   rdatalist.ttl, lctx->maxttl);
 			result = ISC_R_RANGE;
 			goto cleanup;
@@ -2669,7 +2669,7 @@ dns_master_loadfileinc4(const char *master_file, dns_name_t *top,
 	options &= ~DNS_MASTER_CHECKTTL;
 	return (dns_master_loadfileinc5(master_file, top, origin, zclass,
 					options, resign, callbacks, task,
-					done, done_arg, lctxp, include_cb, 
+					done, done_arg, lctxp, include_cb,
 					include_arg, mctx, format, 0));
 }
 
@@ -2681,7 +2681,7 @@ dns_master_loadfileinc5(const char *master_file, dns_name_t *top,
 			isc_task_t *task, dns_loaddonefunc_t done,
 			void *done_arg, dns_loadctx_t **lctxp,
 			dns_masterincludecb_t include_cb, void *include_arg,
-			isc_mem_t *mctx, dns_masterformat_t format, 
+			isc_mem_t *mctx, dns_masterformat_t format,
 			isc_uint32_t maxttl)
 {
 	dns_loadctx_t *lctx = NULL;
diff --git a/lib/isc/aes.c b/lib/isc/aes.c
index e0bbf80e52..4554858ad3 100644
--- a/lib/isc/aes.c
+++ b/lib/isc/aes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * 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
diff --git a/lib/isc/include/isc/aes.h b/lib/isc/include/isc/aes.h
index 1e3a9f4835..bcee74695e 100644
--- a/lib/isc/include/isc/aes.h
+++ b/lib/isc/include/isc/aes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * 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
diff --git a/lib/isc/tests/aes_test.c b/lib/isc/tests/aes_test.c
index c9497b88f8..29c278e66a 100644
--- a/lib/isc/tests/aes_test.c
+++ b/lib/isc/tests/aes_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * 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
@@ -72,7 +72,7 @@ fromhexstr(const char *in, unsigned char *d)
 	ret = isc_hex_decodestring(in, &b);
 	if (ret != ISC_R_SUCCESS)
 		return 0;
-	return isc_buffer_usedlength(&b); 
+	return isc_buffer_usedlength(&b);
 }
 
 typedef struct aes_testcase {
diff --git a/util/bindkeys.pl b/util/bindkeys.pl
index c132490964..eafdcf3427 100755
--- a/util/bindkeys.pl
+++ b/util/bindkeys.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009-2012, 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
diff --git a/util/copyrights b/util/copyrights
index c61b6ae76a..2f5b6e8a37 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -12,15 +12,15 @@
 ./bin/Makefile.in				MAKE	1998,1999,2000,2001,2004,2007,2009,2012,2013,2014
 ./bin/check/.gitignore				X	2012
 ./bin/check/Makefile.in				MAKE	2000,2001,2002,2003,2004,2005,2006,2007,2009,2012,2014
-./bin/check/check-tool.c			C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
-./bin/check/check-tool.h			C	2000,2001,2002,2004,2005,2007,2010,2011,2013
+./bin/check/check-tool.c			C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
+./bin/check/check-tool.h			C	2000,2001,2002,2004,2005,2007,2010,2011,2013,2014
 ./bin/check/named-checkconf.8			MAN	DOCBOOK
 ./bin/check/named-checkconf.c			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014
 ./bin/check/named-checkconf.docbook		SGML	2000,2001,2002,2004,2005,2007,2009,2014
 ./bin/check/named-checkconf.html		HTML	DOCBOOK
 ./bin/check/named-checkzone.8			MAN	DOCBOOK
-./bin/check/named-checkzone.c			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
-./bin/check/named-checkzone.docbook		SGML	2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012,2013
+./bin/check/named-checkzone.c			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
+./bin/check/named-checkzone.docbook		SGML	2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014
 ./bin/check/named-checkzone.html		HTML	DOCBOOK
 ./bin/check/win32/checkconf.dsp.in		X	2001,2004,2005,2006,2009,2013,2014
 ./bin/check/win32/checkconf.dsw			X	2001,2013
@@ -209,10 +209,8 @@
 ./bin/dnssec/win32/verify.vcxproj.user		X	2013
 ./bin/named/.gitignore				X	2012
 ./bin/named/Makefile.in				MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
-./bin/named/bind.keys.h				X	2009,2010,2011,2012
 ./bin/named/bind9.xsl				SGML	2006,2007,2008,2009,2012,2013,2014
 ./bin/named/bind9.xsl.h				X	2007,2008,2009,2011,2012,2013,2014
-./bin/named/bindkeys.pl				PERL	2009,2010,2011,2012
 ./bin/named/builtin.c				C	2001,2002,2003,2004,2005,2007,2009,2010,2011,2012,2013,2014
 ./bin/named/client.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
 ./bin/named/config.c				C	2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
@@ -223,7 +221,7 @@
 ./bin/named/include/.gitignore			X	2012
 ./bin/named/include/dlz/dlz_dlopen_driver.h	C	2011
 ./bin/named/include/named/builtin.h		C	2001,2004,2005,2007
-./bin/named/include/named/client.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013
+./bin/named/include/named/client.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014
 ./bin/named/include/named/config.h		C	2001,2002,2004,2005,2006,2007,2009,2013
 ./bin/named/include/named/control.h		C	2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2014
 ./bin/named/include/named/geoip.h		C	2013
@@ -283,7 +281,7 @@
 ./bin/named/unix/dlz_dlopen_driver.c		C	2011,2012,2013
 ./bin/named/unix/include/named/os.h		C	1999,2000,2001,2002,2004,2005,2007,2008,2009
 ./bin/named/unix/os.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014
-./bin/named/update.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
+./bin/named/update.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
 ./bin/named/win32/dlz_dlopen_driver.c		C	2011,2012,2013
 ./bin/named/win32/include/named/ntservice.h	C	1999,2000,2001,2002,2003,2004,2007
 ./bin/named/win32/include/named/os.h		C	1999,2000,2001,2002,2004,2007,2008,2009
@@ -863,10 +861,11 @@
 ./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-maxttlmap.conf	CONF-C	2014
 ./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,2013
+./bin/tests/system/checkconf/clean.sh		SH	2011,2012,2013,2014
 ./bin/tests/system/checkconf/dlz-bad.conf	CONF-C	2012,2013
 ./bin/tests/system/checkconf/dnssec.1		CONF-C	2011
 ./bin/tests/system/checkconf/dnssec.2		CONF-C	2011
@@ -876,6 +875,10 @@
 ./bin/tests/system/checkconf/inline-bad.conf	CONF-C	2013
 ./bin/tests/system/checkconf/inline-good.conf	CONF-C	2013
 ./bin/tests/system/checkconf/inline-no.conf	CONF-C	2013
+./bin/tests/system/checkconf/max-ttl.conf	CONF-C	2014
+./bin/tests/system/checkconf/maxttl-bad.conf	CONF-C	2014
+./bin/tests/system/checkconf/maxttl-bad.db	ZONE	2014
+./bin/tests/system/checkconf/maxttl.db		ZONE	2014
 ./bin/tests/system/checkconf/notify.conf	CONF-C	2014
 ./bin/tests/system/checkconf/range.conf		CONF-C	2013
 ./bin/tests/system/checkconf/tests.sh		SH	2005,2007,2010,2011,2012,2013,2014
@@ -911,8 +914,9 @@
 ./bin/tests/system/checknames/ns3/root.hints	ZONE	2004,2007
 ./bin/tests/system/checknames/setup.sh		SH	2004,2007,2012
 ./bin/tests/system/checknames/tests.sh		SH	2004,2007,2012,2013
-./bin/tests/system/checkzone/clean.sh		SH	2011,2012,2013
-./bin/tests/system/checkzone/tests.sh		SH	2011,2012,2013
+./bin/tests/system/checkzone/clean.sh		SH	2011,2012,2013,2014
+./bin/tests/system/checkzone/setup.sh		SH	2014
+./bin/tests/system/checkzone/tests.sh		SH	2011,2012,2013,2014
 ./bin/tests/system/checkzone/zones/bad1.db	ZONE	2013
 ./bin/tests/system/checkzone/zones/good1.db	ZONE	2011
 ./bin/tests/system/checkzone/zones/spf.db	ZONE	2013
@@ -1428,7 +1432,8 @@
 ./bin/tests/system/nsupdate/knowngood.ns1.afterstop	X	2001,2004
 ./bin/tests/system/nsupdate/knowngood.ns1.before	X	2000,2001,2003,2004,2009
 ./bin/tests/system/nsupdate/ns1/example1.db	ZONE	2000,2001,2002,2004,2007,2009
-./bin/tests/system/nsupdate/ns1/named.conf	CONF-C	2000,2001,2004,2005,2007,2009,2011,2012,2013
+./bin/tests/system/nsupdate/ns1/max-ttl.db	ZONE	2014
+./bin/tests/system/nsupdate/ns1/named.conf	CONF-C	2000,2001,2004,2005,2007,2009,2011,2012,2013,2014
 ./bin/tests/system/nsupdate/ns2/named.conf	CONF-C	2000,2001,2004,2007,2011,2013
 ./bin/tests/system/nsupdate/ns3/dnskey.test.db.in	ZONE	2011
 ./bin/tests/system/nsupdate/ns3/example.db.in	ZONE	2010
@@ -1661,6 +1666,15 @@
 ./bin/tests/system/runall.sh			SH	2000,2001,2004,2007,2010,2011,2012
 ./bin/tests/system/send.pl			PERL	2001,2004,2007,2011,2012
 ./bin/tests/system/setup.sh			SH	2000,2001,2004,2007,2012
+./bin/tests/system/sit/.gitignore		X	2014
+./bin/tests/system/sit/clean.sh			SH	2014
+./bin/tests/system/sit/ns1/example.db		ZONE	2014
+./bin/tests/system/sit/ns1/named.conf		CONF-C	2014
+./bin/tests/system/sit/ns1/root.hint		ZONE	2014
+./bin/tests/system/sit/ns2/named.conf		CONF-C	2014
+./bin/tests/system/sit/ns2/root.db		ZONE	2014
+./bin/tests/system/sit/prereq.sh.in		SH	2014
+./bin/tests/system/sit/tests.sh			SH	2014
 ./bin/tests/system/smartsign/child.db		ZONE	2010
 ./bin/tests/system/smartsign/clean.sh		SH	2010,2012,2014
 ./bin/tests/system/smartsign/parent.db		ZONE	2010
@@ -2104,7 +2118,7 @@
 ./bin/win32/BINDInstall/res/BINDInstall.rc2	X	2001
 ./bin/win32/BINDInstall/resource.h		X	2001,2005,2009
 ./bind.keys					X	2009,2010,2011
-./bind.keys.h					C	2014
+./bind.keys.h					X	2009,2010,2011,2012,2014
 ./config.guess					X	1998,1999,2000,2001,2004,2009,2013
 ./config.h.in					X	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
 ./config.h.win32				C	1999,2000,2001,2004,2006,2007,2008,2009,2011,2012,2013,2014
@@ -2876,7 +2890,7 @@
 ./lib/dns/include/dns/Makefile.in		MAKE	1998,1999,2000,2001,2002,2003,2004,2007,2008,2009,2011,2012,2013,2014
 ./lib/dns/include/dns/acache.h			C	2004,2006,2007,2013
 ./lib/dns/include/dns/acl.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2011,2013,2014
-./lib/dns/include/dns/adb.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2013
+./lib/dns/include/dns/adb.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2013,2014
 ./lib/dns/include/dns/bit.h			C	2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/byaddr.h			C	2000,2001,2002,2003,2004,2005,2006,2007
 ./lib/dns/include/dns/cache.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2013
@@ -2910,7 +2924,7 @@
 ./lib/dns/include/dns/lib.h			C	1999,2000,2001,2004,2005,2006,2007,2009
 ./lib/dns/include/dns/log.h			C	1999,2000,2001,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014
 ./lib/dns/include/dns/lookup.h			C	2000,2001,2004,2005,2006,2007,2009
-./lib/dns/include/dns/master.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013
+./lib/dns/include/dns/master.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014
 ./lib/dns/include/dns/masterdump.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2011,2013,2014
 ./lib/dns/include/dns/message.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014
 ./lib/dns/include/dns/name.h			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013
@@ -2919,7 +2933,7 @@
 ./lib/dns/include/dns/nsec3.h			C	2008,2009,2010,2011,2012,2013
 ./lib/dns/include/dns/opcode.h			C	2002,2004,2005,2006,2007
 ./lib/dns/include/dns/order.h			C	2002,2004,2005,2006,2007
-./lib/dns/include/dns/peer.h			C	2000,2001,2003,2004,2005,2006,2007,2008,2009,2013
+./lib/dns/include/dns/peer.h			C	2000,2001,2003,2004,2005,2006,2007,2008,2009,2013,2014
 ./lib/dns/include/dns/portlist.h		C	2003,2004,2005,2006,2007
 ./lib/dns/include/dns/private.h			C	2009,2011,2012
 ./lib/dns/include/dns/rbt.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2012,2013,2014
@@ -2944,7 +2958,7 @@
 ./lib/dns/include/dns/secproto.h		C	1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/soa.h			C	2000,2001,2004,2005,2006,2007,2009
 ./lib/dns/include/dns/ssu.h			C	2000,2001,2003,2004,2005,2006,2007,2008,2010,2011
-./lib/dns/include/dns/stats.h			C	2000,2001,2004,2005,2006,2007,2008,2009,2012
+./lib/dns/include/dns/stats.h			C	2000,2001,2004,2005,2006,2007,2008,2009,2012,2014
 ./lib/dns/include/dns/tcpmsg.h			C	1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/time.h			C	1999,2000,2001,2004,2005,2006,2007,2012
 ./lib/dns/include/dns/timer.h			C	2000,2001,2004,2005,2006,2007
@@ -2958,7 +2972,7 @@
 ./lib/dns/include/dns/version.h			C	2001,2004,2005,2006,2007,2012,2013
 ./lib/dns/include/dns/view.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
 ./lib/dns/include/dns/xfrin.h			C	1999,2000,2001,2003,2004,2005,2006,2007,2009,2013
-./lib/dns/include/dns/zone.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
+./lib/dns/include/dns/zone.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
 ./lib/dns/include/dns/zonekey.h			C	2001,2004,2005,2006,2007
 ./lib/dns/include/dns/zt.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2011
 ./lib/dns/include/dst/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012
@@ -2975,7 +2989,7 @@
 ./lib/dns/log.c					C	1999,2000,2001,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014
 ./lib/dns/lookup.c				C	2000,2001,2003,2004,2005,2007,2013
 ./lib/dns/mapapi				X	2013
-./lib/dns/master.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013
+./lib/dns/master.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014
 ./lib/dns/masterdump.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014
 ./lib/dns/message.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
 ./lib/dns/name.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
@@ -3262,6 +3276,7 @@
 ./lib/irs/version.c				C	2009
 ./lib/isc/Atffile				X	2011
 ./lib/isc/Makefile.in				MAKE	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
+./lib/isc/aes.c					C	2014
 ./lib/isc/alpha/Makefile.in			MAKE	2007,2012
 ./lib/isc/alpha/include/Makefile.in		MAKE	2007,2012
 ./lib/isc/alpha/include/isc/Makefile.in		MAKE	2007,2012
@@ -3294,6 +3309,7 @@
 ./lib/isc/ia64/include/isc/atomic.h		C	2006,2007,2009,2012
 ./lib/isc/include/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2012,2014
 ./lib/isc/include/isc/Makefile.in		MAKE	1998,1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014
+./lib/isc/include/isc/aes.h			C	2014
 ./lib/isc/include/isc/app.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2013
 ./lib/isc/include/isc/assertions.h		C	1997,1998,1999,2000,2001,2004,2005,2006,2007,2008,2009
 ./lib/isc/include/isc/backtrace.h		C	2009
@@ -3463,6 +3479,7 @@
 ./lib/isc/taskpool.c				C	1999,2000,2001,2004,2005,2007,2011,2012,2013
 ./lib/isc/tests/Atffile				X	2011
 ./lib/isc/tests/Makefile.in			MAKE	2011,2012,2013,2014
+./lib/isc/tests/aes_test.c			C	2014
 ./lib/isc/tests/hash_test.c			C	2011,2012,2013,2014
 ./lib/isc/tests/isctest.c			C	2011,2012,2013
 ./lib/isc/tests/isctest.h			C	2011,2012
@@ -4133,7 +4150,7 @@
 ./util/COPYRIGHT.NOM				X	2001,2004,2007
 ./util/COPYRIGHT.PORTION			X	1996,1997,1998,1999,2000,2001,2004,2007
 ./util/altbuild.sh				SH	2000,2001,2002,2004,2007,2008,2012
-./util/bindkeys.pl				PERL	2014
+./util/bindkeys.pl				PERL	2009,2010,2011,2012,2014
 ./util/branchsync.sh				SH	2013
 ./util/check-changes				PERL	2002,2004,2007,2012
 ./util/check-includes.pl			PERL	2000,2001,2004,2007,2012