From: Automatic Updater <source@isc.org>
Date: Mon, 28 Feb 2011 01:20:05 +0000 (+0000)
Subject: update copyright notice
X-Git-Tag: v9.8.1b1~335
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=09bde3103bb31bc09fedbc45a9661bd58b63553c;p=thirdparty%2Fbind9.git

update copyright notice
---

diff --git a/Makefile.in b/Makefile.in
index b4095b7bcda..1952b544a43 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.58.250.1 2011/02/26 02:36:45 each Exp $
+# $Id: Makefile.in,v 1.58.250.2 2011/02/28 01:19:57 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index b16bf4d0a04..6a16ea14443 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.237.124.1 2011/02/25 23:08:32 each Exp $ */
+/* $Id: dig.c,v 1.237.124.2 2011/02/28 01:19:57 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 81b4490ddf7..d566bf05142 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.336.22.2 2011/02/25 23:08:32 each Exp $ */
+/* $Id: dighost.c,v 1.336.22.3 2011/02/28 01:19:57 tbox Exp $ */
 
 /*! \file
  *  \note
diff --git a/bin/dig/host.c b/bin/dig/host.c
index d39ea982420..2d17961dc13 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: host.c,v 1.124.40.1 2011/02/21 07:36:41 marka Exp $ */
+/* $Id: host.c,v 1.124.40.2 2011/02/28 01:19:58 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index 996a7a5c652..66876b5ca49 100644
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.h,v 1.111.306.1 2011/02/25 23:08:33 each Exp $ */
+/* $Id: dig.h,v 1.111.306.2 2011/02/28 01:19:58 tbox Exp $ */
 
 #ifndef DIG_H
 #define DIG_H
diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index 5340862c990..48c390b8ae0 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nslookup.c,v 1.127.38.1 2011/02/21 07:25:51 marka Exp $ */
+/* $Id: nslookup.c,v 1.127.38.2 2011/02/28 01:19:58 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/dnssec/dnssec-keyfromlabel.docbook b/bin/dnssec/dnssec-keyfromlabel.docbook
index 9f4a5238cb7..5f3e0e681f9 100644
--- a/bin/dnssec/dnssec-keyfromlabel.docbook
+++ b/bin/dnssec/dnssec-keyfromlabel.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2008-2010  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008-2011  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
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-keyfromlabel.docbook,v 1.18.14.1 2011/02/03 11:59:29 marka Exp $ -->
+<!-- $Id: dnssec-keyfromlabel.docbook,v 1.18.14.2 2011/02/28 01:19:58 tbox Exp $ -->
 <refentry id="man.dnssec-keyfromlabel">
   <refentryinfo>
     <date>February 8, 2008</date>
@@ -39,6 +39,7 @@
       <year>2008</year>
       <year>2009</year>
       <year>2010</year>
+      <year>2011</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 2ad072cf60b..74b26cd2e1e 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.262.110.1 2011/02/24 03:11:48 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.262.110.2 2011/02/28 01:19:58 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/named/config.c b/bin/named/config.c
index 0e04d1877ee..f5e93e42a66 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.113.16.1 2011/02/03 05:50:05 marka Exp $ */
+/* $Id: config.c,v 1.113.16.2 2011/02/28 01:19:58 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index 03aff510d7e..33ff783ca31 100644
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.104.38.1 2011/02/21 07:16:16 marka Exp $ */
+/* $Id: os.c,v 1.104.38.2 2011/02/28 01:19:59 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/named/update.c b/bin/named/update.c
index 54aef580f67..1ef2010e048 100644
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.186.16.1 2011/02/03 06:18:51 marka Exp $ */
+/* $Id: update.c,v 1.186.16.2 2011/02/28 01:19:59 tbox Exp $ */
 
 #include <config.h>
 
@@ -3436,7 +3436,7 @@ add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype,
 	 */
 	for (tuple = ISC_LIST_HEAD(diff->tuples);
 	     tuple != NULL; tuple = next) {
-	
+
 		next = ISC_LIST_NEXT(tuple, link);
 
 		if (tuple->rdata.type != dns_rdatatype_dnskey)
@@ -3500,7 +3500,7 @@ add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype,
 	     tuple = ISC_LIST_HEAD(temp_diff.tuples)) {
 
 		ISC_LIST_UNLINK(temp_diff.tuples, tuple, link);
-                ISC_LIST_APPEND(diff->tuples, tuple, link);
+		ISC_LIST_APPEND(diff->tuples, tuple, link);
 
 		dns_rdata_tostruct(&tuple->rdata, &dnskey, NULL);
 		if ((dnskey.flags &
diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 49904e0ba5d..69ca709bff3 100644
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc.c,v 1.131.20.1 2011/02/03 11:44:45 marka Exp $ */
+/* $Id: rndc.c,v 1.131.20.2 2011/02/28 01:19:59 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/tests/resolver/Makefile.in b/bin/tests/resolver/Makefile.in
index 31c1cbf6f64..65738d039c1 100644
--- a/bin/tests/resolver/Makefile.in
+++ b/bin/tests/resolver/Makefile.in
@@ -1,7 +1,6 @@
-# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 1999-2002  Internet Software Consortium.
+# Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 #
-# Permission to use, copy, modify, and distribute this software for any
+# 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.
 #
@@ -13,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2.2.2 2011/02/03 05:50:06 marka Exp $
+# $Id: Makefile.in,v 1.2.2.3 2011/02/28 01:19:59 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/resolver/t_resolver.c b/bin/tests/resolver/t_resolver.c
index 317ccc26600..4f78c949eb1 100644
--- a/bin/tests/resolver/t_resolver.c
+++ b/bin/tests/resolver/t_resolver.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_resolver.c,v 1.2.2.2 2011/02/03 05:50:06 marka Exp $ */
+/* $Id: t_resolver.c,v 1.2.2.3 2011/02/28 01:19:59 tbox Exp $ */
 
 #include <config.h>
 
@@ -52,7 +52,7 @@ setup_create_dispatch_v4(void)
 {
 	isc_sockaddr_t local_address;
 	isc_sockaddr_any(&local_address);
-	
+
 	CHECK(dns_dispatch_getudp(dispatch_manager, socket_manager, task_manager,
 				  &local_address, 4096, 100, 100, 100, 500,
 				  0, 0, /* unsigned int attributes, unsigned int mask, */
@@ -83,7 +83,7 @@ teardown(void) {
 static isc_result_t
 make_resolver(dns_resolver_t **resolverp) {
 	isc_result_t result;
-	
+
 	result = dns_resolver_create(view,
 			    task_manager, 1,
 			    socket_manager,
@@ -128,7 +128,7 @@ test_dns_resolver_gettimeout(void) {
 		 "The default timeout is returned from _gettimeout()");
 	setup();
 	CHECK(make_resolver(&resolver));
-	
+
 	timeout = dns_resolver_gettimeout(resolver);
 	t_info("The default timeout is %d second%s\n", timeout, (timeout == 1 ? "" : "s"));
 	test_result = (timeout > 0) ? T_PASS : T_FAIL;
@@ -149,7 +149,7 @@ test_dns_resolver_settimeout(void) {
 		 "_settimeout() can change the timeout to a non-default");
 	setup();
 	CHECK(make_resolver(&resolver));
-	
+
 	default_timeout = dns_resolver_gettimeout(resolver);
 	t_info("The default timeout is %d second%s\n", default_timeout,
 	       (default_timeout == 1 ? "" : "s"));
@@ -162,7 +162,7 @@ test_dns_resolver_settimeout(void) {
 
 	destroy_resolver(&resolver);
 	teardown();
-	
+
 	t_result(test_result);
 }
 
@@ -177,7 +177,7 @@ test_dns_resolver_settimeout_to_default(void) {
 		 " by specifying 0 as the timeout.");
 	setup();
 	CHECK(make_resolver(&resolver));
-	
+
 	default_timeout = dns_resolver_gettimeout(resolver);
 	t_info("The default timeout is %d second%s\n", default_timeout,
 	       (default_timeout == 1 ? "" : "s"));
@@ -193,7 +193,7 @@ test_dns_resolver_settimeout_to_default(void) {
 
 	destroy_resolver(&resolver);
 	teardown();
-	
+
 	t_result(test_result);
 }
 
@@ -207,7 +207,7 @@ test_dns_resolver_settimeout_over_maximum(void) {
 		 "_settimeout() cannot set the value larger than the maximum.");
 	setup();
 	CHECK(make_resolver(&resolver));
-	
+
 	dns_resolver_settimeout(resolver, 4000000);
 	timeout = dns_resolver_gettimeout(resolver);
 	t_info("The new timeout is %d second%s\n", timeout,
@@ -217,7 +217,7 @@ test_dns_resolver_settimeout_over_maximum(void) {
 
 	destroy_resolver(&resolver);
 	teardown();
-	
+
 	t_result(test_result);
 }
 
diff --git a/bin/tests/system/database/clean.sh b/bin/tests/system/database/clean.sh
index 27144dd4674..d135a5c7582 100644
--- a/bin/tests/system/database/clean.sh
+++ b/bin/tests/system/database/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011  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
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.2.2.2 2011/02/22 04:25:56 marka Exp $
+# $Id: clean.sh,v 1.2.2.3 2011/02/28 01:19:59 tbox Exp $
 
 rm -f ns1/named.conf ns1/named.run ns1/named.memstats
 rm -f dig.out.*
diff --git a/bin/tests/system/database/ns1/named.conf1 b/bin/tests/system/database/ns1/named.conf1
index 5705a833911..e92e89bd887 100644
--- a/bin/tests/system/database/ns1/named.conf1
+++ b/bin/tests/system/database/ns1/named.conf1
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf1,v 1.2.2.2 2011/02/22 04:25:56 marka Exp $ */
+/* $Id: named.conf1,v 1.2.2.3 2011/02/28 01:20:00 tbox Exp $ */
 
 // NS1
 
diff --git a/bin/tests/system/database/ns1/named.conf2 b/bin/tests/system/database/ns1/named.conf2
index 1073c0b7012..cc91c5167ab 100644
--- a/bin/tests/system/database/ns1/named.conf2
+++ b/bin/tests/system/database/ns1/named.conf2
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf2,v 1.2.2.2 2011/02/22 04:25:56 marka Exp $ */
+/* $Id: named.conf2,v 1.2.2.3 2011/02/28 01:20:00 tbox Exp $ */
 
 // NS1
 
diff --git a/bin/tests/system/database/setup.sh b/bin/tests/system/database/setup.sh
index c1aab9ebaa3..38fb2aedb4b 100644
--- a/bin/tests/system/database/setup.sh
+++ b/bin/tests/system/database/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011  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
@@ -14,6 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.2.2.2 2011/02/22 04:25:56 marka Exp $
+# $Id: setup.sh,v 1.2.2.3 2011/02/28 01:19:59 tbox Exp $
 
 cp ns1/named.conf1 ns1/named.conf
diff --git a/bin/tests/system/database/tests.sh b/bin/tests/system/database/tests.sh
index 7be97be8325..498b8768ff7 100644
--- a/bin/tests/system/database/tests.sh
+++ b/bin/tests/system/database/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011  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
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.2.2.2 2011/02/22 04:25:56 marka Exp $
+# $Id: tests.sh,v 1.2.2.3 2011/02/28 01:19:59 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dns64/ns1/example.db b/bin/tests/system/dns64/ns1/example.db
index 3f2f636f747..79418d2d25c 100644
--- a/bin/tests/system/dns64/ns1/example.db
+++ b/bin/tests/system/dns64/ns1/example.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2010, 2011  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.db,v 1.3.22.1 2011/02/03 07:39:02 marka Exp $
+; $Id: example.db,v 1.3.22.2 2011/02/28 01:20:00 tbox Exp $
 
 $TTL	3600
 @	SOA ns1 marka.isc.org. 0 0 0 0 1200
diff --git a/bin/tests/system/dnssec/ns2/example.db.in b/bin/tests/system/dnssec/ns2/example.db.in
index 3e7293c6cf6..b79e69a88b7 100644
--- a/bin/tests/system/dnssec/ns2/example.db.in
+++ b/bin/tests/system/dnssec/ns2/example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007-2010  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007-2011  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.db.in,v 1.24.162.3 2011/02/23 11:36:03 marka Exp $
+; $Id: example.db.in,v 1.24.162.4 2011/02/28 01:20:00 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh
index 74036131c53..fc7ab3f368f 100644
--- a/bin/tests/system/dnssec/ns2/sign.sh
+++ b/bin/tests/system/dnssec/ns2/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2006-2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006-2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.41.40.3 2011/02/23 11:36:03 marka Exp $
+# $Id: sign.sh,v 1.41.40.4 2011/02/28 01:20:00 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dnssec/ns3/expired.example.db.in b/bin/tests/system/dnssec/ns3/expired.example.db.in
index 22fddbd4a2b..4ca4f41686e 100644
--- a/bin/tests/system/dnssec/ns3/expired.example.db.in
+++ b/bin/tests/system/dnssec/ns3/expired.example.db.in
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2011  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: expired.example.db.in,v 1.1.2.2 2011/02/08 03:48:22 marka Exp $
+; $Id: expired.example.db.in,v 1.1.2.3 2011/02/28 01:20:00 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db b/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
index cede96ac6fb..59d83cb1ad2 100644
--- a/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
+++ b/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2011  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: insecure.below-cname.example.db,v 1.2.2.2 2011/02/23 11:36:03 marka Exp $
+; $Id: insecure.below-cname.example.db,v 1.2.2.3 2011/02/28 01:20:00 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/dnssec/ns3/named.conf b/bin/tests/system/dnssec/ns3/named.conf
index 88b0c57ddae..f8ca4928fcb 100644
--- a/bin/tests/system/dnssec/ns3/named.conf
+++ b/bin/tests/system/dnssec/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.38.86.4 2011/02/23 11:36:03 marka Exp $ */
+/* $Id: named.conf,v 1.38.86.5 2011/02/28 01:20:00 tbox Exp $ */
 
 // NS3
 
diff --git a/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in b/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in
index 16d9f9fd79c..bb2312147a7 100644
--- a/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2011  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: secure.below-cname.example.db.in,v 1.2.2.2 2011/02/23 11:36:03 marka Exp $
+; $Id: secure.below-cname.example.db.in,v 1.2.2.3 2011/02/28 01:20:00 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh
index 1c7fcc31bc0..7b57a8e526b 100644
--- a/bin/tests/system/dnssec/ns3/sign.sh
+++ b/bin/tests/system/dnssec/ns3/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2006-2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006-2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.32.162.4 2011/02/23 11:36:03 marka Exp $
+# $Id: sign.sh,v 1.32.162.5 2011/02/28 01:20:01 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh
index 5b137ea39d6..2feb695af8c 100644
--- a/bin/tests/system/nsupdate/clean.sh
+++ b/bin/tests/system/nsupdate/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.20.24.1 2011/02/03 06:18:51 marka Exp $
+# $Id: clean.sh,v 1.20.24.2 2011/02/28 01:20:01 tbox Exp $
 
 #
 # Clean up after zone transfer tests.
diff --git a/bin/tests/system/nsupdate/ns3/named.conf b/bin/tests/system/nsupdate/ns3/named.conf
index b9667f87b6a..176d538796d 100644
--- a/bin/tests/system/nsupdate/ns3/named.conf
+++ b/bin/tests/system/nsupdate/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.3.24.1 2011/02/03 06:18:51 marka Exp $ */
+/* $Id: named.conf,v 1.3.24.2 2011/02/28 01:20:01 tbox Exp $ */
 
 // NS1
 
diff --git a/bin/tests/system/nsupdate/ns3/sign.sh b/bin/tests/system/nsupdate/ns3/sign.sh
index f1f98e003ce..37f227a0d88 100644
--- a/bin/tests/system/nsupdate/ns3/sign.sh
+++ b/bin/tests/system/nsupdate/ns3/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2011  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
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.2.26.1 2011/02/03 06:18:51 marka Exp $
+# $Id: sign.sh,v 1.2.26.2 2011/02/28 01:20:01 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
index ca79d46cb74..6d1a41c9e93 100644
--- a/bin/tests/system/nsupdate/tests.sh
+++ b/bin/tests/system/nsupdate/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -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.32.24.1 2011/02/03 06:18:51 marka Exp $
+# $Id: tests.sh,v 1.32.24.2 2011/02/28 01:20:01 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index b0fde9d3775..9790137c60f 100644
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -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.31.814.1 2011/02/19 01:21:27 each Exp $
+# $Id: tests.sh,v 1.31.814.2 2011/02/28 01:20:01 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index fc6a1ea63fa..41292eb2fe0 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.254.14.1 2011/02/21 07:10:15 marka Exp $ */
+/* $Id: adb.c,v 1.254.14.2 2011/02/28 01:20:01 tbox Exp $ */
 
 /*! \file
  *
diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index ef85214e08f..b5dfb922c2c 100644
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.168.248.1 2011/02/03 05:50:06 marka Exp $ */
+/* $Id: dispatch.c,v 1.168.248.2 2011/02/28 01:20:01 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
index 71a7adfa03d..66e0f0b2fc9 100644
--- a/lib/dns/include/dns/Makefile.in
+++ b/lib/dns/include/dns/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.57.296.1 2011/02/22 11:50:42 marka Exp $
+# $Id: Makefile.in,v 1.57.296.2 2011/02/28 01:20:02 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index f5037da717a..4662706fefe 100644
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.h,v 1.67.86.1 2011/02/03 05:50:07 marka Exp $ */
+/* $Id: resolver.h,v 1.67.86.2 2011/02/28 01:20:02 tbox Exp $ */
 
 #ifndef DNS_RESOLVER_H
 #define DNS_RESOLVER_H 1
diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index 447316200dd..a290f3b0816 100644
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ncache.c,v 1.50.124.1 2011/02/03 07:39:03 marka Exp $ */
+/* $Id: ncache.c,v 1.50.124.2 2011/02/28 01:20:02 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c
index 8e9c6f2cb96..3d69d9ca00b 100644
--- a/lib/dns/rcode.c
+++ b/lib/dns/rcode.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rcode.c,v 1.16.14.1 2011/02/21 06:52:20 marka Exp $ */
+/* $Id: rcode.c,v 1.16.14.2 2011/02/28 01:20:02 tbox Exp $ */
 
 #include <config.h>
 #include <ctype.h>
diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c
index 8a4a2bceb61..96516db5c47 100644
--- a/lib/dns/rdatalist.c
+++ b/lib/dns/rdatalist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatalist.c,v 1.40.40.1 2011/02/21 07:03:01 marka Exp $ */
+/* $Id: rdatalist.c,v 1.40.40.2 2011/02/28 01:20:02 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index bbb7e572188..f1d7587445e 100644
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataslab.c,v 1.52.148.1 2011/02/03 07:39:03 marka Exp $ */
+/* $Id: rdataslab.c,v 1.52.148.2 2011/02/28 01:20:02 tbox Exp $ */
 
 /*! \file */
 
@@ -150,7 +150,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
 	if (nalloc > 0xffff)
 		return (ISC_R_NOSPACE);
 
-	
+
 	if (nalloc != 0) {
 		x = isc_mem_get(mctx, nalloc * sizeof(struct xrdata));
 		if (x == NULL)
diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
index b0a4cedc7f8..9e2cc6b6811 100644
--- a/lib/dns/tests/dnstest.c
+++ b/lib/dns/tests/dnstest.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnstest.c,v 1.2.2.2 2011/02/26 02:36:46 each Exp $ */
+/* $Id: dnstest.c,v 1.2.2.3 2011/02/28 01:20:03 tbox Exp $ */
 
 /*! \file */
 
@@ -46,12 +46,12 @@ static isc_boolean_t hash_active = ISC_FALSE, dst_active = ISC_FALSE;
  * Logging categories: this needs to match the list in bin/named/log.c.
  */
 static isc_logcategory_t categories[] = {
-	        { "",                0 },
-	        { "client",          0 },
-	        { "network",         0 },
-	        { "update",          0 },
-	        { "queries",         0 },
-	        { "unmatched",       0 },
+		{ "",                0 },
+		{ "client",          0 },
+		{ "network",         0 },
+		{ "update",          0 },
+		{ "queries",         0 },
+		{ "unmatched",       0 },
 		{ "update-security", 0 },
 		{ "query-errors",    0 },
 		{ NULL,              0 }
diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c
index 1ecf3add743..26bc8c797dd 100644
--- a/lib/dns/tests/master_test.c
+++ b/lib/dns/tests/master_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master_test.c,v 1.2.2.2 2011/02/26 02:36:46 each Exp $ */
+/* $Id: master_test.c,v 1.2.2.3 2011/02/28 01:20:03 tbox Exp $ */
 
 /*! \file */
 
@@ -107,7 +107,7 @@ test_master(const char *testfile) {
 ATF_TC(master_load);
 ATF_TC_HEAD(master_load, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() loads a "
-			  	       "valid master file and returns success");
+				       "valid master file and returns success");
 }
 ATF_TC_BODY(master_load, tc) {
 	isc_result_t result;
@@ -128,7 +128,7 @@ ATF_TC_BODY(master_load, tc) {
 ATF_TC(master_unexpected);
 ATF_TC_HEAD(master_unexpected, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() returns "
-			  	       "DNS_R_UNEXPECTED when file ends "
+				       "DNS_R_UNEXPECTED when file ends "
 				       "too soon");
 }
 ATF_TC_BODY(master_unexpected, tc) {
@@ -150,7 +150,7 @@ ATF_TC_BODY(master_unexpected, tc) {
 ATF_TC(master_noowner);
 ATF_TC_HEAD(master_noowner, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() accepts broken "
-			  	       "zones with no TTL for first record "
+				       "zones with no TTL for first record "
 				       "if it is an SOA");
 }
 ATF_TC_BODY(master_noowner, tc) {
@@ -172,7 +172,7 @@ ATF_TC_BODY(master_noowner, tc) {
 ATF_TC(master_nottl);
 ATF_TC_HEAD(master_nottl, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() returns "
-			  	       "DNS_R_NOOWNER when no owner name "
+				       "DNS_R_NOOWNER when no owner name "
 				       "is specified");
 }
 
@@ -195,7 +195,7 @@ ATF_TC_BODY(master_nottl, tc) {
 ATF_TC(master_badclass);
 ATF_TC_HEAD(master_badclass, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() returns "
-			  	       "DNS_R_BADCLASS when record class "
+				       "DNS_R_BADCLASS when record class "
 				       "doesn't match zone class");
 }
 ATF_TC_BODY(master_badclass, tc) {
@@ -216,7 +216,7 @@ ATF_TC_BODY(master_badclass, tc) {
 ATF_TC(master_dnskey);
 ATF_TC_HEAD(master_dnskey, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() understands "
-			  	       "DNSKEY with key material");
+				       "DNSKEY with key material");
 }
 ATF_TC_BODY(master_dnskey, tc) {
 	isc_result_t result;
@@ -237,7 +237,7 @@ ATF_TC_BODY(master_dnskey, tc) {
 ATF_TC(master_dnsnokey);
 ATF_TC_HEAD(master_dnsnokey, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() understands "
-			  	       "DNSKEY with no key material");
+				       "DNSKEY with no key material");
 }
 ATF_TC_BODY(master_dnsnokey, tc) {
 	isc_result_t result;
@@ -257,7 +257,7 @@ ATF_TC_BODY(master_dnsnokey, tc) {
 ATF_TC(master_include);
 ATF_TC_HEAD(master_include, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() understands "
-			  	       "$INCLUDE");
+				       "$INCLUDE");
 }
 ATF_TC_BODY(master_include, tc) {
 	isc_result_t result;
@@ -277,7 +277,7 @@ ATF_TC_BODY(master_include, tc) {
 ATF_TC(master_includefail);
 ATF_TC_HEAD(master_includefail, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() understands "
-			  	       "$INCLUDE failures");
+				       "$INCLUDE failures");
 }
 ATF_TC_BODY(master_includefail, tc) {
 	isc_result_t result;
@@ -298,7 +298,7 @@ ATF_TC_BODY(master_includefail, tc) {
 ATF_TC(master_blanklines);
 ATF_TC_HEAD(master_blanklines, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() handles "
-			  	       "non-empty blank lines");
+				       "non-empty blank lines");
 }
 ATF_TC_BODY(master_blanklines, tc) {
 	isc_result_t result;
@@ -318,7 +318,7 @@ ATF_TC_BODY(master_blanklines, tc) {
 ATF_TC(master_leadingzero);
 ATF_TC_HEAD(master_leadingzero, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() allows "
-			  	       "leading zeroes in SOA");
+				       "leading zeroes in SOA");
 }
 ATF_TC_BODY(master_leadingzero, tc) {
 	isc_result_t result;
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 6923cc54c31..43b980983db 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.197.14.1 2011/02/23 11:36:02 marka Exp $ */
+/* $Id: validator.c,v 1.197.14.2 2011/02/28 01:20:02 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 1e98d7cf4c0..337ae31b158 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.166.522.2 2011/02/19 01:21:27 each Exp $ */
+/* $Id: xfrin.c,v 1.166.522.3 2011/02/28 01:20:02 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/httpd.c b/lib/isc/httpd.c
index 7305a0187a3..be30d52f36a 100644
--- a/lib/isc/httpd.c
+++ b/lib/isc/httpd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006-2008, 2010, 2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: httpd.c,v 1.20.40.1 2011/02/21 05:57:17 marka Exp $ */
+/* $Id: httpd.c,v 1.20.40.2 2011/02/28 01:20:03 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h
index 18ab6a1f133..ad6549ed974 100644
--- a/lib/isc/include/isc/task.h
+++ b/lib/isc/include/isc/task.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009-2011  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
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.h,v 1.69.14.1 2011/02/03 05:50:07 marka Exp $ */
+/* $Id: task.h,v 1.69.14.2 2011/02/28 01:20:04 tbox Exp $ */
 
 #ifndef ISC_TASK_H
 #define ISC_TASK_H 1
diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c
index 3051cdbba75..b9fe853f9e6 100644
--- a/lib/isc/netaddr.c
+++ b/lib/isc/netaddr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netaddr.c,v 1.41.38.1 2011/02/21 06:32:19 marka Exp $ */
+/* $Id: netaddr.c,v 1.41.38.2 2011/02/28 01:20:03 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index 41108350cd1..c97644f14dc 100644
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sockaddr.c,v 1.73.38.1 2011/02/21 06:21:24 marka Exp $ */
+/* $Id: sockaddr.c,v 1.73.38.2 2011/02/28 01:20:03 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/task.c b/lib/isc/task.c
index 291a72fc2f0..d86e27ea5df 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.c,v 1.115.14.1 2011/02/03 05:50:07 marka Exp $ */
+/* $Id: task.c,v 1.115.14.2 2011/02/28 01:20:03 tbox Exp $ */
 
 /*! \file
  * \author Principal Author: Bob Halley
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index c8b066b589d..afc6d66799a 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.95.302.1 2011/02/03 05:50:07 marka Exp $ */
+/* $Id: timer.c,v 1.95.302.2 2011/02/28 01:20:03 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index ac0f9750449..6c41422ef1f 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.333.14.2 2011/02/18 04:01:16 marka Exp $ */
+/* $Id: socket.c,v 1.333.14.3 2011/02/28 01:20:04 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/win32/include/isc/ipv6.h b/lib/isc/win32/include/isc/ipv6.h
index a96e75e32ad..5f2dc2af7ef 100644
--- a/lib/isc/win32/include/isc/ipv6.h
+++ b/lib/isc/win32/include/isc/ipv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipv6.h,v 1.19.814.1 2011/02/03 08:16:30 marka Exp $ */
+/* $Id: ipv6.h,v 1.19.814.2 2011/02/28 01:20:04 tbox Exp $ */
 
 #ifndef ISC_IPV6_H
 #define ISC_IPV6_H 1
diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index 6ba3c572e26..9c43634f5bf 100644
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001, 2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.12.244.1 2011/02/19 01:29:31 each Exp $
+# $Id: Makefile.in,v 1.12.244.2 2011/02/28 01:20:04 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index a708f82373b..d7f23c8fe74 100644
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007, 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.21.244.1 2011/02/19 01:29:31 each Exp $
+# $Id: Makefile.in,v 1.21.244.2 2011/02/28 01:20:04 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/make/rules.in b/make/rules.in
index 0f078977b5f..25805f23541 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.68.346.1 2011/02/26 02:36:48 each Exp $
+# $Id: rules.in,v 1.68.346.2 2011/02/28 01:20:04 tbox Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
diff --git a/unit/unittest.sh.in b/unit/unittest.sh.in
index 2f418ce27a7..be16f535fcb 100644
--- a/unit/unittest.sh.in
+++ b/unit/unittest.sh.in
@@ -1,4 +1,20 @@
 #!/bin/sh
+#
+# Copyright (C) 2011  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.
+
+# $Id: unittest.sh.in,v 1.2.2.4 2011/02/28 01:20:04 tbox Exp $
 
 PATH=${PATH}:@ATFBIN@
 export PATH
diff --git a/util/merge_copyrights b/util/merge_copyrights
index f9b5dfe88d1..ee676700521 100644
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl -w
 #
-# Copyright (C) 2004-2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2007, 2009-2011  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
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: merge_copyrights,v 1.38.22.2 2011/02/28 01:09:09 marka Exp $
+# $Id: merge_copyrights,v 1.38.22.3 2011/02/28 01:20:05 tbox Exp $
 
 %file_types = ();
 %file_years = ();