From 9e5debd879665f339dd0f082137d64f787f2e9d3 Mon Sep 17 00:00:00 2001
From: Automatic Updater <source@isc.org>
Date: Sat, 12 Mar 2011 04:57:33 +0000
Subject: [PATCH] update copyright notice

---
 bin/check/named-checkconf.c          |  4 ++--
 bin/dnssec/dnssec-keyfromlabel.c     |  4 ++--
 bin/dnssec/dnssec-keygen.c           |  4 ++--
 bin/named/controlconf.c              |  4 ++--
 bin/named/interfacemgr.c             |  4 ++--
 bin/named/logconf.c                  | 10 +++++-----
 bin/named/main.c                     |  4 ++--
 bin/named/query.c                    |  4 ++--
 bin/named/statschannel.c             |  4 ++--
 bin/named/zoneconf.c                 |  4 ++--
 bin/nsupdate/nsupdate.c              |  4 ++--
 bin/tests/db/t_db.c                  | 18 +++++++++---------
 bin/tests/master/t_master.c          |  4 ++--
 bin/tests/names/t_names.c            |  4 ++--
 bin/tests/rbt/t_rbt.c                |  4 ++--
 bin/tests/system/common/rndc.key     |  5 ++---
 bin/tests/system/xfer/clean.sh       |  4 ++--
 bin/tests/system/xfer/ns1/named.conf |  4 ++--
 bin/tests/system/xfer/ns3/named.conf |  4 ++--
 bin/tests/system/xfer/ns6/named.conf |  5 ++---
 bin/tests/system/xfer/ns7/named.conf |  5 ++---
 bin/tests/tasks/t_tasks.c            |  4 ++--
 bin/tests/timers/t_timers.c          |  4 ++--
 lib/bind9/check.c                    |  4 ++--
 lib/dns/diff.c                       |  4 ++--
 lib/dns/dispatch.c                   |  4 ++--
 lib/dns/dst_openssl.h                |  4 ++--
 lib/dns/journal.c                    |  4 ++--
 lib/dns/master.c                     |  4 ++--
 lib/dns/masterdump.c                 |  4 ++--
 lib/dns/message.c                    |  4 ++--
 lib/dns/name.c                       |  4 ++--
 lib/dns/nsec.c                       |  4 ++--
 lib/dns/openssl_link.c               |  4 ++--
 lib/dns/openssldsa_link.c            |  4 ++--
 lib/dns/opensslrsa_link.c            |  4 ++--
 lib/dns/rbt.c                        |  4 ++--
 lib/dns/rdataset.c                   |  4 ++--
 lib/dns/request.c                    |  4 ++--
 lib/dns/sdlz.c                       |  4 ++--
 lib/dns/tkey.c                       |  4 ++--
 lib/dns/ttl.c                        |  4 ++--
 lib/dns/view.c                       |  4 ++--
 lib/isc/include/isc/file.h           |  6 +++---
 lib/isc/include/isc/util.h           |  4 ++--
 lib/isc/log.c                        |  4 ++--
 lib/isc/radix.c                      |  4 ++--
 lib/isc/rwlock.c                     |  4 ++--
 lib/isc/sha1.c                       |  4 ++--
 lib/isc/sha2.c                       | 22 +++++++++++-----------
 lib/isc/string.c                     |  4 ++--
 lib/isc/timer.c                      |  4 ++--
 lib/isc/unix/dir.c                   |  4 ++--
 lib/isc/unix/file.c                  |  4 ++--
 lib/isc/unix/stdio.c                 |  4 ++--
 lib/isc/unix/time.c                  |  4 ++--
 lib/isc/win32/dir.c                  |  4 ++--
 lib/isc/win32/file.c                 | 28 ++++++++++++++--------------
 lib/isccfg/namedconf.c               |  4 ++--
 lib/lwres/assert_p.h                 |  4 ++--
 lib/lwres/herror.c                   |  4 ++--
 lib/lwres/lwconfig.c                 |  4 ++--
 lib/lwres/print.c                    |  4 ++--
 63 files changed, 158 insertions(+), 161 deletions(-)

diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index da6f34dc19..14272e4f79 100644
--- a/bin/check/named-checkconf.c
+++ b/bin/check/named-checkconf.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) 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: named-checkconf.c,v 1.46.222.5 2011/03/11 10:49:49 marka Exp $ */
+/* $Id: named-checkconf.c,v 1.46.222.6 2011/03/12 04:57:22 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c
index e21b84eb5e..8e87fc759c 100644
--- a/bin/dnssec/dnssec-keyfromlabel.c
+++ b/bin/dnssec/dnssec-keyfromlabel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2007, 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: dnssec-keyfromlabel.c,v 1.4.50.3 2011/03/11 10:49:50 marka Exp $ */
+/* $Id: dnssec-keyfromlabel.c,v 1.4.50.4 2011/03/12 04:57:22 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 7e47be85f0..0717fc3264 100644
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2008, 2010, 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-keygen.c,v 1.81.48.3 2011/03/11 10:49:50 marka Exp $ */
+/* $Id: dnssec-keygen.c,v 1.81.48.4 2011/03/12 04:57:23 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index 16a7bb03ba..775152a5a0 100644
--- a/bin/named/controlconf.c
+++ b/bin/named/controlconf.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) 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: controlconf.c,v 1.60.70.1 2011/03/11 10:49:50 marka Exp $ */
+/* $Id: controlconf.c,v 1.60.70.2 2011/03/12 04:57:23 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
index 7318c3ff04..5192cbc301 100644
--- a/bin/named/interfacemgr.c
+++ b/bin/named/interfacemgr.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-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: interfacemgr.c,v 1.93.70.3 2011/03/11 10:49:50 marka Exp $ */
+/* $Id: interfacemgr.c,v 1.93.70.4 2011/03/12 04:57:23 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/named/logconf.c b/bin/named/logconf.c
index 1deac1ee5d..5341961221 100644
--- a/bin/named/logconf.c
+++ b/bin/named/logconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: logconf.c,v 1.42.334.3 2011/03/12 04:48:02 marka Exp $ */
+/* $Id: logconf.c,v 1.42.334.4 2011/03/12 04:57:23 tbox Exp $ */
 
 /*! \file */
 
@@ -225,12 +225,12 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *lctx) {
 		 * Test to make sure that file is a plain file.
 		 * Fix defect #22771
 		*/
-                result = isc_file_isplainfile(dest.file.name);
-                if (result == ISC_R_SUCCESS || 
+		result = isc_file_isplainfile(dest.file.name);
+		if (result == ISC_R_SUCCESS ||
 		    result == ISC_R_FILENOTFOUND) {
 			/*
 			 * Test that the file can be opened, since
-			 * isc_log_open() can't effectively report 
+			 * isc_log_open() can't effectively report
 			 * failures when called in
 			 * isc_log_doit().
 			 */
@@ -238,7 +238,7 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *lctx) {
 			if (result != ISC_R_SUCCESS) {
 				syslog(LOG_ERR,
 					"isc_stdio_open '%s' failed: %s",
-					dest.file.name, 
+					dest.file.name,
 					isc_result_totext(result));
 				fprintf(stderr,
 					"isc_stdio_open '%s' failed: %s",
diff --git a/bin/named/main.c b/bin/named/main.c
index 30cfb9a8f1..44991c37e1 100644
--- a/bin/named/main.c
+++ b/bin/named/main.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: main.c,v 1.166.34.8 2011/03/11 10:49:50 marka Exp $ */
+/* $Id: main.c,v 1.166.34.9 2011/03/12 04:57:23 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/named/query.c b/bin/named/query.c
index 45321032cd..1d9575cda8 100644
--- a/bin/named/query.c
+++ b/bin/named/query.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: query.c,v 1.313.20.25 2011/03/11 10:49:50 marka Exp $ */
+/* $Id: query.c,v 1.313.20.26 2011/03/12 04:57:23 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index 2f07e6d860..4cad296290 100644
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: statschannel.c,v 1.14.64.12 2011/03/11 10:49:51 marka Exp $ */
+/* $Id: statschannel.c,v 1.14.64.13 2011/03/12 04:57:23 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 1e7909088c..43069873af 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.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: zoneconf.c,v 1.147.50.4 2011/03/11 10:49:51 marka Exp $ */
+/* $Id: zoneconf.c,v 1.147.50.5 2011/03/12 04:57:24 tbox Exp $ */
 
 /*% */
 
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index a8dc554b04..616e099c7b 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.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: nsupdate.c,v 1.163.48.16 2011/03/11 10:49:52 marka Exp $ */
+/* $Id: nsupdate.c,v 1.163.48.17 2011/03/12 04:57:24 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/tests/db/t_db.c b/bin/tests/db/t_db.c
index 9bc5f18c29..9640a6c6a7 100644
--- a/bin/tests/db/t_db.c
+++ b/bin/tests/db/t_db.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) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_db.c,v 1.36.332.3 2011/03/11 10:49:52 marka Exp $ */
+/* $Id: t_db.c,v 1.36.332.4 2011/03/12 04:57:24 tbox Exp $ */
 
 #include <config.h>
 
@@ -2514,13 +2514,13 @@ t_dns_db_findnode_1(char **av) {
 	isc_buffer_add(&name_buffer, len);
 	dns_result = dns_name_fromtext(dns_fixedname_name(&dns_name),
 				&name_buffer, NULL, ISC_FALSE, NULL);
-        if (dns_result != ISC_R_SUCCESS) {
-                t_info("dns_name_fromtext failed %s\n",
-                               dns_result_totext(dns_result));
-                dns_db_detach(&db);
-                isc_mem_destroy(&mctx);
-                return(T_UNRESOLVED);
-        }
+	if (dns_result != ISC_R_SUCCESS) {
+		t_info("dns_name_fromtext failed %s\n",
+			       dns_result_totext(dns_result));
+		dns_db_detach(&db);
+		isc_mem_destroy(&mctx);
+		return(T_UNRESOLVED);
+	}
 
 	dns_result = dns_db_findnode(db, dns_fixedname_name(&dns_name),
 				ISC_FALSE, &nodep);
diff --git a/bin/tests/master/t_master.c b/bin/tests/master/t_master.c
index d167a5b508..9d83ee6d24 100644
--- a/bin/tests/master/t_master.c
+++ b/bin/tests/master/t_master.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-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: t_master.c,v 1.36.332.3 2011/03/11 10:49:52 marka Exp $ */
+/* $Id: t_master.c,v 1.36.332.4 2011/03/12 04:57:24 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c
index cbb011561a..0eb43f9cb0 100644
--- a/bin/tests/names/t_names.c
+++ b/bin/tests/names/t_names.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) 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: t_names.c,v 1.46.158.3 2011/03/11 10:49:52 marka Exp $ */
+/* $Id: t_names.c,v 1.46.158.4 2011/03/12 04:57:24 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/tests/rbt/t_rbt.c b/bin/tests/rbt/t_rbt.c
index d5951aefa1..135f91fc3f 100644
--- a/bin/tests/rbt/t_rbt.c
+++ b/bin/tests/rbt/t_rbt.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-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: t_rbt.c,v 1.30.332.3 2011/03/11 10:49:52 marka Exp $ */
+/* $Id: t_rbt.c,v 1.30.332.4 2011/03/12 04:57:24 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/tests/system/common/rndc.key b/bin/tests/system/common/rndc.key
index 8f77a593db..5478b57910 100644
--- a/bin/tests/system/common/rndc.key
+++ b/bin/tests/system/common/rndc.key
@@ -1,6 +1,5 @@
 /*
- * 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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc.key,v 1.2.6.2 2011/03/11 00:52:37 marka Exp $ */
+/* $Id: rndc.key,v 1.2.6.3 2011/03/12 04:57:24 tbox Exp $ */
 
 key rndc_key {
         secret "1234abcd8765";
diff --git a/bin/tests/system/xfer/clean.sh b/bin/tests/system/xfer/clean.sh
index 9d5a4c5544..62cee7f5bd 100644
--- a/bin/tests/system/xfer/clean.sh
+++ b/bin/tests/system/xfer/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 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: clean.sh,v 1.14.250.1 2011/03/11 00:52:38 marka Exp $
+# $Id: clean.sh,v 1.14.250.2 2011/03/12 04:57:25 tbox Exp $
 
 #
 # Clean up after zone transfer tests.
diff --git a/bin/tests/system/xfer/ns1/named.conf b/bin/tests/system/xfer/ns1/named.conf
index 9f54c4aaa9..382a09481c 100644
--- a/bin/tests/system/xfer/ns1/named.conf
+++ b/bin/tests/system/xfer/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.18.332.1 2011/03/11 00:52:38 marka Exp $ */
+/* $Id: named.conf,v 1.18.332.2 2011/03/12 04:57:25 tbox Exp $ */
 
 include "../../common/rndc.key";
 
diff --git a/bin/tests/system/xfer/ns3/named.conf b/bin/tests/system/xfer/ns3/named.conf
index 9eaf65b64e..d5b2e3a871 100644
--- a/bin/tests/system/xfer/ns3/named.conf
+++ b/bin/tests/system/xfer/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.21.332.1 2011/03/11 00:52:38 marka Exp $ */
+/* $Id: named.conf,v 1.21.332.2 2011/03/12 04:57:25 tbox Exp $ */
 
 controls { /* empty */ };
 
diff --git a/bin/tests/system/xfer/ns6/named.conf b/bin/tests/system/xfer/ns6/named.conf
index d5da42bc9f..d100146a7c 100644
--- a/bin/tests/system/xfer/ns6/named.conf
+++ b/bin/tests/system/xfer/ns6/named.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2.6.2 2011/03/11 00:52:38 marka Exp $ */
+/* $Id: named.conf,v 1.2.6.3 2011/03/12 04:57:25 tbox Exp $ */
 
 include "../../common/rndc.key";
 
diff --git a/bin/tests/system/xfer/ns7/named.conf b/bin/tests/system/xfer/ns7/named.conf
index 810c173e1f..9aa2a2b60f 100644
--- a/bin/tests/system/xfer/ns7/named.conf
+++ b/bin/tests/system/xfer/ns7/named.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2.6.2 2011/03/11 00:52:38 marka Exp $ */
+/* $Id: named.conf,v 1.2.6.3 2011/03/12 04:57:25 tbox Exp $ */
 
 include "../../common/rndc.key";
 
diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c
index 42062feff6..8e15031651 100644
--- a/bin/tests/tasks/t_tasks.c
+++ b/bin/tests/tasks/t_tasks.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-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_tasks.c,v 1.40.332.3 2011/03/11 10:49:53 marka Exp $ */
+/* $Id: t_tasks.c,v 1.40.332.4 2011/03/12 04:57:25 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/tests/timers/t_timers.c b/bin/tests/timers/t_timers.c
index 57fc0e332d..c018b60200 100644
--- a/bin/tests/timers/t_timers.c
+++ b/bin/tests/timers/t_timers.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_timers.c,v 1.28.156.3 2011/03/11 10:49:53 marka Exp $ */
+/* $Id: t_timers.c,v 1.28.156.4 2011/03/12 04:57:25 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index e7c5ba6285..f0c62894c7 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.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: check.c,v 1.95.12.7 2011/03/11 10:49:53 marka Exp $ */
+/* $Id: check.c,v 1.95.12.8 2011/03/12 04:57:26 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/diff.c b/lib/dns/diff.c
index 8131b9762b..d52a59ec5c 100644
--- a/lib/dns/diff.c
+++ b/lib/dns/diff.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) 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: diff.c,v 1.18.50.3 2011/03/11 10:49:53 marka Exp $ */
+/* $Id: diff.c,v 1.18.50.4 2011/03/12 04:57:26 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 3a8cc7e1bc..883e5d076f 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.155.12.12 2011/03/11 10:49:53 marka Exp $ */
+/* $Id: dispatch.c,v 1.155.12.13 2011/03/12 04:57:26 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/dst_openssl.h b/lib/dns/dst_openssl.h
index dfec680be6..df7df1cadc 100644
--- a/lib/dns/dst_openssl.h
+++ b/lib/dns/dst_openssl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 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: dst_openssl.h,v 1.7.120.1 2011/03/11 01:39:11 marka Exp $ */
+/* $Id: dst_openssl.h,v 1.7.120.2 2011/03/12 04:57:26 tbox Exp $ */
 
 #ifndef DST_OPENSSL_H
 #define DST_OPENSSL_H 1
diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 78abb3985f..43a58d494e 100644
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2010  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: journal.c,v 1.103.48.9 2011/03/11 10:49:54 marka Exp $ */
+/* $Id: journal.c,v 1.103.48.10 2011/03/12 04:57:26 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/dns/master.c b/lib/dns/master.c
index b2624e200e..2b6114a41a 100644
--- a/lib/dns/master.c
+++ b/lib/dns/master.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: master.c,v 1.171.120.3 2011/03/11 10:49:54 marka Exp $ */
+/* $Id: master.c,v 1.171.120.4 2011/03/12 04:57:26 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 636be9525a..dfd832c24a 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.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: masterdump.c,v 1.94.50.6 2011/03/11 10:49:54 marka Exp $ */
+/* $Id: masterdump.c,v 1.94.50.7 2011/03/12 04:57:26 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/message.c b/lib/dns/message.c
index e7025cdb12..a6379ee8f5 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.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: message.c,v 1.245.50.8 2011/03/11 10:49:54 marka Exp $ */
+/* $Id: message.c,v 1.245.50.9 2011/03/12 04:57:27 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/name.c b/lib/dns/name.c
index cea6142ac7..deb16d1928 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2010, 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: name.c,v 1.165.120.4 2011/03/11 10:49:54 marka Exp $ */
+/* $Id: name.c,v 1.165.120.5 2011/03/12 04:57:27 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/nsec.c b/lib/dns/nsec.c
index 83f40cc2cf..bf96f57dc6 100644
--- a/lib/dns/nsec.c
+++ b/lib/dns/nsec.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) 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: nsec.c,v 1.11.48.3 2011/03/11 10:49:54 marka Exp $ */
+/* $Id: nsec.c,v 1.11.48.4 2011/03/12 04:57:27 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index bd3667c5ba..cdb05de975 100644
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.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
@@ -31,7 +31,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssl_link.c,v 1.22.112.6 2011/03/11 01:39:11 marka Exp $
+ * $Id: openssl_link.c,v 1.22.112.7 2011/03/12 04:57:27 tbox Exp $
  */
 #ifdef OPENSSL
 
diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
index c3a2d451f6..e885092d0f 100644
--- a/lib/dns/openssldsa_link.c
+++ b/lib/dns/openssldsa_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  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: openssldsa_link.c,v 1.13.120.3 2011/03/11 10:49:54 marka Exp $ */
+/* $Id: openssldsa_link.c,v 1.13.120.4 2011/03/12 04:57:27 tbox Exp $ */
 
 #ifdef OPENSSL
 #ifndef USE_EVP
diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index be108052ec..603f630d4e 100644
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.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
@@ -17,7 +17,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.20.50.10 2011/03/11 03:02:50 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.20.50.11 2011/03/12 04:57:27 tbox Exp $
  */
 #ifdef OPENSSL
 #include <config.h>
diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index 4ac0aa2fa6..c4cac3a8d1 100644
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.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) 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: rbt.c,v 1.142.50.4 2011/03/11 10:49:54 marka Exp $ */
+/* $Id: rbt.c,v 1.142.50.5 2011/03/12 04:57:27 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index ca573fa8c1..e2e5867e39 100644
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.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: rdataset.c,v 1.82.50.5 2011/03/11 10:49:55 marka Exp $ */
+/* $Id: rdataset.c,v 1.82.50.6 2011/03/12 04:57:27 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/request.c b/lib/dns/request.c
index 9f16953972..3d2c5c9df2 100644
--- a/lib/dns/request.c
+++ b/lib/dns/request.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) 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: request.c,v 1.82.72.3 2011/03/11 10:49:55 marka Exp $ */
+/* $Id: request.c,v 1.82.72.4 2011/03/12 04:57:27 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index 31ca7936ad..82ebc5f6cc 100644
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2005-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2005-2011  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -50,7 +50,7 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdlz.c,v 1.18.50.7 2011/03/11 10:49:56 marka Exp $ */
+/* $Id: sdlz.c,v 1.18.50.8 2011/03/12 04:57:27 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index 31af55ae68..e259dcedd1 100644
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-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
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tkey.c,v 1.90.118.5 2011/03/11 10:49:56 marka Exp $
+ * $Id: tkey.c,v 1.90.118.6 2011/03/12 04:57:28 tbox Exp $
  */
 /*! \file */
 #include <config.h>
diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c
index 8002918716..d0023d93a8 100644
--- a/lib/dns/ttl.c
+++ b/lib/dns/ttl.c
@@ -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-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ttl.c,v 1.29.332.1 2011/03/11 10:49:56 marka Exp $ */
+/* $Id: ttl.c,v 1.29.332.2 2011/03/12 04:57:28 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/view.c b/lib/dns/view.c
index 01c4572ba6..2e7b7c0b42 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.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: view.c,v 1.150.84.7 2011/03/11 10:49:57 marka Exp $ */
+/* $Id: view.c,v 1.150.84.8 2011/03/12 04:57:28 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h
index 4decfe5157..7ae752e8bc 100644
--- a/lib/isc/include/isc/file.h
+++ b/lib/isc/include/isc/file.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: file.h,v 1.33.332.3 2011/03/12 04:48:02 marka Exp $ */
+/* $Id: file.h,v 1.33.332.4 2011/03/12 04:57:31 tbox Exp $ */
 
 #ifndef ISC_FILE_H
 #define ISC_FILE_H 1
@@ -195,7 +195,7 @@ isc_file_isplainfile(const char *name);
  *		The file does not exist. This return code comes from
  *		errno=ENOENT when stat returns -1. This code is mentioned
  *		here, because in logconf.c, it is the one rcode that is
- *		permitted in addition to ISC_R_SUCCESS. This is done since 
+ *		permitted in addition to ISC_R_SUCCESS. This is done since
  *		the next call in logconf.c is to isc_stdio_open(), which
  *		will create the file if it can.
  *\li	#other ISC_R_* errors translated from errno
diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 8a465928be..ee55f1e80d 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -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) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: util.h,v 1.30.332.3 2011/03/11 10:49:58 marka Exp $ */
+/* $Id: util.h,v 1.30.332.4 2011/03/12 04:57:32 tbox Exp $ */
 
 #ifndef ISC_UTIL_H
 #define ISC_UTIL_H 1
diff --git a/lib/isc/log.c b/lib/isc/log.c
index 388a856c50..bf63d6ec02 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 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: log.c,v 1.94.332.6 2011/03/11 10:49:58 marka Exp $ */
+/* $Id: log.c,v 1.94.332.7 2011/03/12 04:57:28 tbox Exp $ */
 
 /*! \file
  * \author  Principal Authors: DCL */
diff --git a/lib/isc/radix.c b/lib/isc/radix.c
index 66042fbdad..47a0741ed4 100644
--- a/lib/isc/radix.c
+++ b/lib/isc/radix.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2007-2009, 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: radix.c,v 1.20.36.4 2011/03/11 10:49:58 marka Exp $ */
+/* $Id: radix.c,v 1.20.36.5 2011/03/12 04:57:28 tbox Exp $ */
 
 /*
  * This source was adapted from MRT's RCS Ids:
diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
index 6b55ab63b6..b3d9fedec2 100644
--- a/lib/isc/rwlock.c
+++ b/lib/isc/rwlock.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-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: rwlock.c,v 1.44.332.3 2011/03/11 10:49:58 marka Exp $ */
+/* $Id: rwlock.c,v 1.44.332.4 2011/03/12 04:57:28 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/sha1.c b/lib/isc/sha1.c
index 5f1aa44b9f..f22fd749bc 100644
--- a/lib/isc/sha1.c
+++ b/lib/isc/sha1.c
@@ -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) 2000, 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: sha1.c,v 1.18.332.1 2011/03/11 10:49:58 marka Exp $ */
+/* $Id: sha1.c,v 1.18.332.2 2011/03/12 04:57:28 tbox Exp $ */
 
 /*	$NetBSD: sha1.c,v 1.5 2000/01/22 22:19:14 mycroft Exp $	*/
 /*	$OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $	*/
diff --git a/lib/isc/sha2.c b/lib/isc/sha2.c
index 00e49eb5f9..7220af89cd 100644
--- a/lib/isc/sha2.c
+++ b/lib/isc/sha2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005-2007, 2009-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: sha2.c,v 1.13.332.5 2011/03/11 10:49:58 marka Exp $ */
+/* $Id: sha2.c,v 1.13.332.6 2011/03/12 04:57:28 tbox Exp $ */
 
 /*	$FreeBSD: src/sys/crypto/sha2/sha2.c,v 1.2.2.2 2002/03/05 08:36:47 ume Exp $	*/
 /*	$KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $	*/
@@ -570,8 +570,8 @@ void isc_sha256_transform(isc_sha256_t *context, const isc_uint32_t* data) {
 
 	/* Clean up */
 	a = b = c = d = e = f = g = h = T1 = 0;
-        /* Avoid compiler warnings */
-        POST(a); POST(b); POST(c); POST(d); POST(e); POST(f);
+	/* Avoid compiler warnings */
+	POST(a); POST(b); POST(c); POST(d); POST(e); POST(f);
 	POST(g); POST(h); POST(T1);
 }
 
@@ -653,9 +653,9 @@ isc_sha256_transform(isc_sha256_t *context, const isc_uint32_t* data) {
 	context->state[7] += h;
 
 	/* Clean up */
-        a = b = c = d = e = f = g = h = T1 = T2 = 0;
-        /* Avoid compiler warnings */
-        POST(a); POST(b); POST(c); POST(d); POST(e); POST(f);
+	a = b = c = d = e = f = g = h = T1 = T2 = 0;
+	/* Avoid compiler warnings */
+	POST(a); POST(b); POST(c); POST(d); POST(e); POST(f);
 	POST(g); POST(h); POST(T1); POST(T2);
 }
 
@@ -928,8 +928,8 @@ void isc_sha512_transform(isc_sha512_t *context, const isc_uint64_t* data) {
 
 	/* Clean up */
 	a = b = c = d = e = f = g = h = T1 = 0;
-        /* Avoid compiler warnings */
-        POST(a); POST(b); POST(c); POST(d); POST(e); POST(f);
+	/* Avoid compiler warnings */
+	POST(a); POST(b); POST(c); POST(d); POST(e); POST(f);
 	POST(g); POST(h); POST(T1);
 }
 
@@ -1010,8 +1010,8 @@ isc_sha512_transform(isc_sha512_t *context, const isc_uint64_t* data) {
 
 	/* Clean up */
 	a = b = c = d = e = f = g = h = T1 = T2 = 0;
-        /* Avoid compiler warnings */
-        POST(a); POST(b); POST(c); POST(d); POST(e); POST(f);
+	/* Avoid compiler warnings */
+	POST(a); POST(b); POST(c); POST(d); POST(e); POST(f);
 	POST(g); POST(h); POST(T1); POST(T2);
 }
 
diff --git a/lib/isc/string.c b/lib/isc/string.c
index 9a66d7e762..7a0a88299d 100644
--- a/lib/isc/string.c
+++ b/lib/isc/string.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 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: string.c,v 1.20.332.1 2011/03/11 10:49:58 marka Exp $ */
+/* $Id: string.c,v 1.20.332.2 2011/03/12 04:57:28 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 7676b50e08..5fa605dcc0 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.84.58.5 2011/03/11 10:49:58 marka Exp $ */
+/* $Id: timer.c,v 1.84.58.6 2011/03/12 04:57:28 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/dir.c b/lib/isc/unix/dir.c
index b41be297f3..eba36d52c0 100644
--- a/lib/isc/unix/dir.c
+++ b/lib/isc/unix/dir.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) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dir.c,v 1.25.332.4 2011/03/11 10:49:59 marka Exp $ */
+/* $Id: dir.c,v 1.25.332.5 2011/03/12 04:57:32 tbox Exp $ */
 
 /*! \file
  * \author  Principal Authors: DCL */
diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index db7763f1d8..a32193a2e8 100644
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.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) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: file.c,v 1.51.332.3 2011/03/12 04:48:03 marka Exp $ */
+/* $Id: file.c,v 1.51.332.4 2011/03/12 04:57:32 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c
index 1c19a58217..71f734a3b6 100644
--- a/lib/isc/unix/stdio.c
+++ b/lib/isc/unix/stdio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdio.c,v 1.8.332.1 2011/03/12 04:48:03 marka Exp $ */
+/* $Id: stdio.c,v 1.8.332.2 2011/03/12 04:57:32 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c
index 7ac579f8ea..e542147ae5 100644
--- a/lib/isc/unix/time.c
+++ b/lib/isc/unix/time.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) 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: time.c,v 1.56.134.1 2011/03/11 10:49:59 marka Exp $ */
+/* $Id: time.c,v 1.56.134.2 2011/03/12 04:57:32 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/win32/dir.c b/lib/isc/win32/dir.c
index 4a7ec2d597..c4f478a051 100644
--- a/lib/isc/win32/dir.c
+++ b/lib/isc/win32/dir.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dir.c,v 1.16.22.3 2011/03/11 10:49:59 marka Exp $ */
+/* $Id: dir.c,v 1.16.22.4 2011/03/12 04:57:32 tbox Exp $ */
 
 /* Principal Authors: DCL */
 
diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index ff48584bb6..e2da04a9e4 100644
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  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
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: file.c,v 1.31.332.1 2011/03/12 04:48:03 marka Exp $ */
+/* $Id: file.c,v 1.31.332.2 2011/03/12 04:57:32 tbox Exp $ */
 
 #include <config.h>
 
@@ -213,9 +213,9 @@ isc_file_getmodtime(const char *file, isc_time_t *time) {
 			 &time->absolute))
 	{
 		close(fh);
-                errno = EINVAL;
-                return (isc__errno2result(errno));
-        }
+		errno = EINVAL;
+		return (isc__errno2result(errno));
+	}
 	close(fh);
 	return (ISC_R_SUCCESS);
 }
@@ -229,23 +229,23 @@ isc_file_settime(const char *file, isc_time_t *time) {
 	if ((fh = open(file, _O_RDWR | _O_BINARY)) < 0)
 		return (isc__errno2result(errno));
 
-        /*
+	/*
 	 * Set the date via the filedate system call and return.  Failing
-         * this call implies the new file times are not supported by the
-         * underlying file system.
-         */
+	 * this call implies the new file times are not supported by the
+	 * underlying file system.
+	 */
 	if (!SetFileTime((HANDLE) _get_osfhandle(fh),
 			 NULL,
 			 &time->absolute,
 			 &time->absolute))
 	{
 		close(fh);
-                errno = EINVAL;
-                return (isc__errno2result(errno));
-        }
+		errno = EINVAL;
+		return (isc__errno2result(errno));
+	}
 
 	close(fh);
-        return (ISC_R_SUCCESS);
+	return (ISC_R_SUCCESS);
 
 }
 
@@ -474,7 +474,7 @@ isc_file_progname(const char *filename, char *progname, size_t namelen) {
 		return (ISC_R_SUCCESS);
 	}
 
-	/* 
+	/*
 	 * Copy the result to the buffer
 	 */
 	len = p - s;
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index bb1de77c98..c7bd34255b 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002, 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: namedconf.c,v 1.92.44.3 2011/03/11 10:49:59 marka Exp $ */
+/* $Id: namedconf.c,v 1.92.44.4 2011/03/12 04:57:33 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/lwres/assert_p.h b/lib/lwres/assert_p.h
index 8bbb86b85e..29ab6c50a9 100644
--- a/lib/lwres/assert_p.h
+++ b/lib/lwres/assert_p.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) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: assert_p.h,v 1.14.332.1 2011/03/11 10:50:00 marka Exp $ */
+/* $Id: assert_p.h,v 1.14.332.2 2011/03/12 04:57:33 tbox Exp $ */
 
 #ifndef LWRES_ASSERT_P_H
 #define LWRES_ASSERT_P_H 1
diff --git a/lib/lwres/herror.c b/lib/lwres/herror.c
index a7a59cb491..0d70a3bc84 100644
--- a/lib/lwres/herror.c
+++ b/lib/lwres/herror.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2005, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -72,7 +72,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] =
-	"$Id: herror.c,v 1.17.332.1 2011/03/11 10:50:00 marka Exp $";
+	"$Id: herror.c,v 1.17.332.2 2011/03/12 04:57:33 tbox Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>
diff --git a/lib/lwres/lwconfig.c b/lib/lwres/lwconfig.c
index ea2c2af459..0904290225 100644
--- a/lib/lwres/lwconfig.c
+++ b/lib/lwres/lwconfig.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) 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: lwconfig.c,v 1.46.332.3 2011/03/11 10:50:00 marka Exp $ */
+/* $Id: lwconfig.c,v 1.46.332.4 2011/03/12 04:57:33 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/lwres/print.c b/lib/lwres/print.c
index 5f54ad97df..a902687fe8 100644
--- a/lib/lwres/print.c
+++ b/lib/lwres/print.c
@@ -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-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: print.c,v 1.10.332.1 2011/03/11 10:50:00 marka Exp $ */
+/* $Id: print.c,v 1.10.332.2 2011/03/12 04:57:33 tbox Exp $ */
 
 #include <config.h>