From 135bcc2e42a94543f11af2a4196b13552ab46d89 Mon Sep 17 00:00:00 2001
From: Automatic Updater <source@isc.org>
Date: Tue, 11 Jan 2011 23:47:14 +0000
Subject: [PATCH] update copyright notice

---
 bin/named/client.c                   |  4 ++--
 bin/named/server.c                   |  4 ++--
 bin/named/tsigconf.c                 |  4 ++--
 bin/tests/Makefile.in                |  4 ++--
 bin/tests/atomic/Makefile.in         |  7 +++----
 bin/tests/atomic/t_atomic.c          | 22 +++++++++++-----------
 bin/tests/system/staticstub/tests.sh |  4 ++--
 bin/tests/system/tkey/keycreate.c    |  4 ++--
 bin/tests/system/tkey/keydelete.c    |  4 ++--
 configure.in                         |  4 ++--
 lib/dns/dst_api.c                    | 12 ++++++------
 lib/dns/dst_internal.h               |  4 ++--
 lib/dns/gssapi_link.c                |  4 ++--
 lib/dns/hmac_link.c                  |  4 ++--
 lib/dns/include/dns/result.h         |  4 ++--
 lib/dns/include/dns/tsig.h           |  4 ++--
 lib/dns/include/dns/view.h           |  4 ++--
 lib/dns/include/dst/dst.h            |  8 ++++----
 lib/dns/openssldh_link.c             |  4 ++--
 lib/dns/openssldsa_link.c            |  4 ++--
 lib/dns/opensslrsa_link.c            |  4 ++--
 lib/dns/result.c                     |  4 ++--
 lib/dns/spnego.c                     |  4 ++--
 lib/dns/tsig.c                       | 12 ++++++------
 lib/dns/view.c                       |  6 +++---
 lib/isc/include/isc/file.h           |  4 ++--
 lib/isc/unix/file.c                  |  4 ++--
 lib/isc/win32/file.c                 |  6 +++---
 28 files changed, 78 insertions(+), 79 deletions(-)

diff --git a/bin/named/client.c b/bin/named/client.c
index 1a7e343272..29ebeeec59 100644
--- a/bin/named/client.c
+++ b/bin/named/client.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: client.c,v 1.270 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: client.c,v 1.271 2011/01/11 23:47:12 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/named/server.c b/bin/named/server.c
index 25e9196f79..030dc40e21 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.596 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: server.c,v 1.597 2011/01/11 23:47:12 tbox Exp $ */
 
 /*! \file */
 
@@ -2212,7 +2212,7 @@ configure_view(dns_view_t *view, cfg_parser_t* parser,
 			dns_view_setdynamickeyring(view, ring);
 		dns_tsigkeyring_detach(&ring);
 		dns_view_detach(&pview);
-	} else 
+	} else
 		dns_view_restorekeyring(view);
 
 	/*
diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c
index 6a81f1fa4c..776b1b9f83 100644
--- a/bin/named/tsigconf.c
+++ b/bin/named/tsigconf.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: tsigconf.c,v 1.34 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: tsigconf.c,v 1.35 2011/01/11 23:47:12 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index f077e99f34..e57ec01e7b 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -1,4 +1,4 @@
-# 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
@@ -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.143 2011/01/11 21:36:22 mgraff Exp $
+# $Id: Makefile.in,v 1.144 2011/01/11 23:47:12 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/atomic/Makefile.in b/bin/tests/atomic/Makefile.in
index 757ad1dbf5..b7c00465b4 100644
--- a/bin/tests/atomic/Makefile.in
+++ b/bin/tests/atomic/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.1 2011/01/11 21:40:35 mgraff Exp $
+# $Id: Makefile.in,v 1.2 2011/01/11 23:47:12 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/tests/atomic/t_atomic.c b/bin/tests/atomic/t_atomic.c
index 0aabccace5..5f713c0283 100644
--- a/bin/tests/atomic/t_atomic.c
+++ b/bin/tests/atomic/t_atomic.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_atomic.c,v 1.1 2011/01/11 21:36:22 mgraff Exp $ */
+/* $Id: t_atomic.c,v 1.2 2011/01/11 23:47:12 tbox Exp $ */
 
 #include <config.h>
 
@@ -76,7 +76,7 @@ void
 do_xadd(isc_task_t *task, isc_event_t *ev) {
 	counter_t *state = (counter_t *)ev->ev_arg;
 	int i;
-	
+
 	for (i = 0 ; i < COUNTS_PER_ITERATION ; i++) {
 		isc_atomic_xadd(&counter_32, 1);
 	}
@@ -100,10 +100,10 @@ test_atomic_xadd() {
 		 "ensure that isc_atomic_xadd() works.");
 
 	setup();
-	
+
 	memset(counters, 0, sizeof(counters));
 	counter_32 = 0;
-	
+
 	/*
 	 * Create our tasks, and allocate an event to get the counters going.
 	 */
@@ -111,7 +111,7 @@ test_atomic_xadd() {
 		tasks[i] = NULL;
 		CHECK(isc_task_create(task_manager, 0, &tasks[i]));
 		event = isc_event_allocate(mctx, NULL, 1000, do_xadd,
-				   	   &counters[i], sizeof(struct isc_event));
+					   &counters[i], sizeof(struct isc_event));
 		isc_task_sendanddetach(&tasks[i], &event);
 	}
 
@@ -122,7 +122,7 @@ test_atomic_xadd() {
 	if (counter_32 != EXPECTED_COUNT_32)
 		test_result = T_FAIL;
 	t_result(test_result);
-	
+
 	counter_32 = 0;
 }
 #endif
@@ -136,7 +136,7 @@ void
 do_xaddq(isc_task_t *task, isc_event_t *ev) {
 	counter_t *state = (counter_t *)ev->ev_arg;
 	int i;
-	
+
 	for (i = 0 ; i < COUNTS_PER_ITERATION ; i++) {
 		isc_atomic_xaddq(&counter_64, INCREMENT_64);
 	}
@@ -160,10 +160,10 @@ test_atomic_xaddq() {
 		 "ensure that isc_atomic_xaddq() works.");
 
 	setup();
-	
+
 	memset(counters, 0, sizeof(counters));
 	counter_64 = 0;
-	
+
 	/*
 	 * Create our tasks, and allocate an event to get the counters going.
 	 */
@@ -171,7 +171,7 @@ test_atomic_xaddq() {
 		tasks[i] = NULL;
 		CHECK(isc_task_create(task_manager, 0, &tasks[i]));
 		event = isc_event_allocate(mctx, NULL, 1000, do_xaddq,
-				   	   &counters[i], sizeof(struct isc_event));
+					   &counters[i], sizeof(struct isc_event));
 		isc_task_sendanddetach(&tasks[i], &event);
 	}
 
@@ -183,7 +183,7 @@ test_atomic_xaddq() {
 	if (counter_64 != EXPECTED_COUNT_64)
 		test_result = T_FAIL;
 	t_result(test_result);
-	
+
 	counter_64 = 0;
 }
 #endif
diff --git a/bin/tests/system/staticstub/tests.sh b/bin/tests/system/staticstub/tests.sh
index c40e962190..7b2b3fb3f8 100755
--- a/bin/tests/system/staticstub/tests.sh
+++ b/bin/tests/system/staticstub/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 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: tests.sh,v 1.4 2011/01/10 05:08:49 marka Exp $
+# $Id: tests.sh,v 1.5 2011/01/11 23:47:12 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
index b0eb63bacb..a417a91b23 100644
--- a/bin/tests/system/tkey/keycreate.c
+++ b/bin/tests/system/tkey/keycreate.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) 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: keycreate.c,v 1.19 2011/01/10 13:09:49 marka Exp $ */
+/* $Id: keycreate.c,v 1.20 2011/01/11 23:47:13 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
index 2d6ecd0d7e..1bb33e85fe 100644
--- a/bin/tests/system/tkey/keydelete.c
+++ b/bin/tests/system/tkey/keydelete.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 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: keydelete.c,v 1.17 2011/01/10 13:09:49 marka Exp $ */
+/* $Id: keydelete.c,v 1.18 2011/01/11 23:47:13 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/configure.in b/configure.in
index 37afe35318..9035a3d500 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# 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
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.510 $)
+AC_REVISION($Revision: 1.511 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index 2f5c87ff19..649ccd42ba 100644
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.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: dst_api.c,v 1.56 2011/01/10 05:32:03 marka Exp $
+ * $Id: dst_api.c,v 1.57 2011/01/11 23:47:13 tbox Exp $
  */
 
 /*! \file */
@@ -1201,11 +1201,11 @@ dst_key_restore(dns_name_t *name, unsigned int alg, unsigned int flags,
 	isc_result_t result;
 	dst_key_t *key;
 
-        REQUIRE(dst_initialized == ISC_TRUE);
-        REQUIRE(keyp != NULL && *keyp == NULL);
+	REQUIRE(dst_initialized == ISC_TRUE);
+	REQUIRE(keyp != NULL && *keyp == NULL);
 
-        if (alg >= DST_MAX_ALGS || dst_t_func[alg] == NULL)
-                return (DST_R_UNSUPPORTEDALG);
+	if (alg >= DST_MAX_ALGS || dst_t_func[alg] == NULL)
+		return (DST_R_UNSUPPORTEDALG);
 
 	if (dst_t_func[alg]->restore == NULL)
 		return (ISC_R_NOTIMPLEMENTED);
diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
index d2d144742b..f2b3e3e5c4 100644
--- a/lib/dns/dst_internal.h
+++ b/lib/dns/dst_internal.h
@@ -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) 2000-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: dst_internal.h,v 1.28 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: dst_internal.h,v 1.29 2011/01/11 23:47:13 tbox Exp $ */
 
 #ifndef DST_DST_INTERNAL_H
 #define DST_DST_INTERNAL_H 1
diff --git a/lib/dns/gssapi_link.c b/lib/dns/gssapi_link.c
index e7f5ee320e..b368ed095e 100644
--- a/lib/dns/gssapi_link.c
+++ b/lib/dns/gssapi_link.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
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: gssapi_link.c,v 1.15 2011/01/10 05:32:03 marka Exp $
+ * $Id: gssapi_link.c,v 1.16 2011/01/11 23:47:13 tbox Exp $
  */
 
 #include <config.h>
diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c
index 996ac18cef..bc0e9a04ed 100644
--- a/lib/dns/hmac_link.c
+++ b/lib/dns/hmac_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-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -31,7 +31,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: hmac_link.c,v 1.18 2011/01/10 05:32:03 marka Exp $
+ * $Id: hmac_link.c,v 1.19 2011/01/11 23:47:13 tbox Exp $
  */
 
 #include <config.h>
diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h
index 0d1d03551d..9195f20e10 100644
--- a/lib/dns/include/dns/result.h
+++ b/lib/dns/include/dns/result.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) 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: result.h,v 1.121 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: result.h,v 1.122 2011/01/11 23:47:13 tbox Exp $ */
 
 #ifndef DNS_RESULT_H
 #define DNS_RESULT_H 1
diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h
index 1de89dd43e..0422414d6e 100644
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.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) 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: tsig.h,v 1.58 2011/01/10 05:32:04 marka Exp $ */
+/* $Id: tsig.h,v 1.59 2011/01/11 23:47:13 tbox Exp $ */
 
 #ifndef DNS_TSIG_H
 #define DNS_TSIG_H 1
diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index 946858702b..d52e466785 100644
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.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-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.h,v 1.130 2011/01/10 05:32:04 marka Exp $ */
+/* $Id: view.h,v 1.131 2011/01/11 23:47:13 tbox Exp $ */
 
 #ifndef DNS_VIEW_H
 #define DNS_VIEW_H 1
diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h
index c2b4eaddb3..0563603678 100644
--- a/lib/dns/include/dst/dst.h
+++ b/lib/dns/include/dst/dst.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) 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: dst.h,v 1.30 2011/01/10 05:32:04 marka Exp $ */
+/* $Id: dst.h,v 1.31 2011/01/11 23:47:14 tbox Exp $ */
 
 #ifndef DST_DST_H
 #define DST_DST_H 1
@@ -868,8 +868,8 @@ dst_key_dump(dst_key_t *key, isc_mem_t *mctx, char **buffer, int *length);
 
 isc_result_t
 dst_key_restore(dns_name_t *name, unsigned int alg, unsigned int flags,
-                unsigned int protocol, dns_rdataclass_t rdclass,
-                isc_mem_t *mctx, const char *keystr, dst_key_t **keyp);
+		unsigned int protocol, dns_rdataclass_t rdclass,
+		isc_mem_t *mctx, const char *keystr, dst_key_t **keyp);
 
 
 ISC_LANG_ENDDECLS
diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c
index 8727e58878..71b4b1229c 100644
--- a/lib/dns/openssldh_link.c
+++ b/lib/dns/openssldh_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
@@ -31,7 +31,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssldh_link.c,v 1.19 2011/01/10 05:32:03 marka Exp $
+ * $Id: openssldh_link.c,v 1.20 2011/01/11 23:47:13 tbox Exp $
  */
 
 #ifdef OPENSSL
diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
index 000ac2266f..b623cc80ec 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.19 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: openssldsa_link.c,v 1.20 2011/01/11 23:47:13 tbox Exp $ */
 
 #ifdef OPENSSL
 #ifndef USE_EVP
diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index 38f6ad1864..2c3d9ee6af 100644
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.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-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.38 2011/01/10 05:32:03 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.39 2011/01/11 23:47:13 tbox Exp $
  */
 #ifdef OPENSSL
 #include <config.h>
diff --git a/lib/dns/result.c b/lib/dns/result.c
index a1c78d96b7..547ac14c35 100644
--- a/lib/dns/result.c
+++ b/lib/dns/result.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) 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: result.c,v 1.131 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: result.c,v 1.132 2011/01/11 23:47:13 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c
index 97117cb13e..c728e3f945 100644
--- a/lib/dns/spnego.c
+++ b/lib/dns/spnego.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006-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: spnego.c,v 1.15 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: spnego.c,v 1.16 2011/01/11 23:47:13 tbox Exp $ */
 
 /*! \file
  * \brief
diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index b3e094418d..c9c32c2986 100644
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.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
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.146 2011/01/10 07:38:22 marka Exp $
+ * $Id: tsig.c,v 1.147 2011/01/11 23:47:13 tbox Exp $
  */
 /*! \file */
 #include <config.h>
@@ -550,7 +550,7 @@ dst_alg_fromname(dns_name_t *algorithm) {
 	} else if (dns_name_equal(algorithm, DNS_TSIG_HMACSHA512_NAME)) {
 		return (DST_ALG_HMACSHA512);
 	} else if (dns_name_equal(algorithm, DNS_TSIG_GSSAPI_NAME)) {
-		return (DST_ALG_GSSAPI); 
+		return (DST_ALG_GSSAPI);
 	} else if (dns_name_equal(algorithm, DNS_TSIG_GSSAPIMS_NAME)) {
 		return (DST_ALG_GSSAPI);
 	} else
@@ -629,9 +629,9 @@ dump_key(dns_tsigkey_t *tkey, FILE *fp)
 {
 	char *buffer = NULL;
 	int length = 0;
-        char namestr[DNS_NAME_FORMATSIZE];
-        char creatorstr[DNS_NAME_FORMATSIZE];
-        char algorithmstr[DNS_NAME_FORMATSIZE];
+	char namestr[DNS_NAME_FORMATSIZE];
+	char creatorstr[DNS_NAME_FORMATSIZE];
+	char algorithmstr[DNS_NAME_FORMATSIZE];
 	isc_result_t result;
 
 	dns_name_format(&tkey->name, namestr, sizeof(namestr));
diff --git a/lib/dns/view.c b/lib/dns/view.c
index 132b8745bc..7d795c2185 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.175 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: view.c,v 1.176 2011/01/11 23:47:13 tbox Exp $ */
 
 /*! \file */
 
@@ -304,7 +304,7 @@ destroy(dns_view_t *view) {
 			if (result == ISC_R_SUCCESS) {
 				if (fclose(fp) == 0)
 					result = isc_file_rename(template,
-							         keyfile);
+								 keyfile);
 				if (result != ISC_R_SUCCESS)
 					(void)remove(template);
 			} else {
diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h
index 4f5b1db91f..ec00145cf8 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.38 2011/01/10 05:32:04 marka Exp $ */
+/* $Id: file.h,v 1.39 2011/01/11 23:47:14 tbox Exp $ */
 
 #ifndef ISC_FILE_H
 #define ISC_FILE_H 1
diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index 4e3d7cd2c1..c8db210ad7 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.56 2011/01/10 05:32:04 marka Exp $ */
+/* $Id: file.c,v 1.57 2011/01/11 23:47:14 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index 22f749a8b5..4c55052537 100644
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.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) 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.36 2011/01/10 05:32:04 marka Exp $ */
+/* $Id: file.c,v 1.37 2011/01/11 23:47:14 tbox Exp $ */
 
 #include <config.h>
 
@@ -345,7 +345,7 @@ isc_file_openuniquemode(char *templet, unsigned int mode, FILE **fp) {
 	if (fd == -1)
 		result = isc__errno2result(errno);
 	if (result == ISC_R_SUCCESS) {
-#if 1 
+#if 1
 		UNUSED(mode)
 #else
 		(void)fchmod(fd, mode);