diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c
index a154a98175..e3683c85fe 100644
--- a/bin/dnssec/dnssec-revoke.c
+++ b/bin/dnssec/dnssec-revoke.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-revoke.c,v 1.19 2009/12/18 07:49:42 each Exp $ */
+/* $Id: dnssec-revoke.c,v 1.20 2009/12/18 23:49:02 tbox Exp $ */
 
 /*! \file */
 
@@ -56,7 +56,7 @@ usage(void) {
 	fprintf(stderr, "Version: %s\n", VERSION);
 #ifdef USE_PKCS11
 	fprintf(stderr, "    -E engine:    specify OpenSSL engine "
-				           "(default \"pkcs11\")\n");
+					   "(default \"pkcs11\")\n");
 #else
 	fprintf(stderr, "    -E engine:    specify OpenSSL engine\n");
 #endif
diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c
index 9d4f33de2b..ace041b026 100644
--- a/bin/dnssec/dnssec-settime.c
+++ b/bin/dnssec/dnssec-settime.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-settime.c,v 1.20 2009/12/18 07:49:42 each Exp $ */
+/* $Id: dnssec-settime.c,v 1.21 2009/12/18 23:49:02 tbox Exp $ */
 
 /*! \file */
 
@@ -59,7 +59,7 @@ usage(void) {
 	fprintf(stderr, "General options:\n");
 #ifdef USE_PKCS11
 	fprintf(stderr, "     -E engine:         specify OpenSSL engine "
-				                 "(default \"pkcs11\")\n");
+						 "(default \"pkcs11\")\n");
 #else
 	fprintf(stderr, "     -E engine:         specify OpenSSL engine\n");
 #endif
diff --git a/bin/named/update.c b/bin/named/update.c
index a832f3431d..6753b3b924 100644
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.177 2009/12/18 22:16:49 each Exp $ */
+/* $Id: update.c,v 1.178 2009/12/18 23:49:03 tbox Exp $ */
 
 #include <config.h>
 
@@ -3044,7 +3044,7 @@ check_dnssec(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
 	for (tuple = ISC_LIST_HEAD(diff->tuples);
 	     tuple != NULL;
 	     tuple = ISC_LIST_NEXT(tuple, link)) {
-	        if (tuple->op != DNS_DIFFOP_ADD)
+		if (tuple->op != DNS_DIFFOP_ADD)
 			continue;
 
 		if (tuple->rdata.type == dns_rdatatype_dnskey) {
@@ -3052,7 +3052,7 @@ check_dnssec(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
 			alg = tuple->rdata.data[3];
 			if (alg == DST_ALG_RSAMD5 || alg == DST_ALG_RSASHA1 ||
 			    alg == DST_ALG_DSA || alg == DST_ALG_ECC) {
-			    	nseconly = ISC_TRUE;
+				nseconly = ISC_TRUE;
 				break;
 			}
 		} else if (tuple->rdata.type == dns_rdatatype_nsec3param) {
diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index 4920b6516f..6509a89c25 100644
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dnssec.c,v 1.116 2009/12/18 22:16:49 each Exp $
+ * $Id: dnssec.c,v 1.117 2009/12/18 23:49:03 tbox Exp $
  */
 
 /*! \file */
@@ -671,7 +671,7 @@ dns_dnssec_findzonekeys2(dns_db_t *db, dns_dbversion_t *ver,
 					sizeof(keybuf));
 			dns_secalg_format(dst_key_alg(pubkey), algbuf,
 					  sizeof(algbuf));
-			isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, 
+			isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
 				      DNS_LOGMODULE_DNSSEC, ISC_LOG_WARNING,
 				      "dns_dnssec_findzonekeys2: error "
 				      "reading private key file %s/%s/%d: %s",
@@ -1257,7 +1257,7 @@ dns_dnssec_findmatchingkeys(dns_name_t *origin, const char *directory,
 
 			if (result != ISC_R_SUCCESS) {
 				isc_log_write(dns_lctx,
-					      DNS_LOGCATEGORY_GENERAL, 
+					      DNS_LOGCATEGORY_GENERAL,
 					      DNS_LOGMODULE_DNSSEC,
 					      ISC_LOG_WARNING,
 					      "dns_dnssec_findmatchingkeys: "
@@ -1456,7 +1456,7 @@ dns_dnssec_keylistfromrdataset(dns_name_t *origin,
 					sizeof(keybuf));
 			dns_secalg_format(dst_key_alg(pubkey), algbuf,
 					  sizeof(algbuf));
-			isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, 
+			isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
 				      DNS_LOGMODULE_DNSSEC, ISC_LOG_WARNING,
 				      "dns_dnssec_keylistfromrdataset: error "
 				      "reading private key file %s/%s/%d: %s",
diff --git a/lib/dns/log.c b/lib/dns/log.c
index 9c6cd5080f..388dd8f79b 100644
--- a/lib/dns/log.c
+++ b/lib/dns/log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009  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: log.c,v 1.46 2009/12/18 22:16:49 each Exp $ */
+/* $Id: log.c,v 1.47 2009/12/18 23:49:03 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index f08b72ecb1..37ae4b62df 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.542 2009/12/18 22:16:49 each Exp $ */
+/* $Id: zone.c,v 1.543 2009/12/18 23:49:03 tbox Exp $ */
 
 /*! \file */
 
@@ -13647,17 +13647,17 @@ dnskey_sane(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
 	for (tuple = ISC_LIST_HEAD(diff->tuples);
 	     tuple != NULL;
 	     tuple = ISC_LIST_NEXT(tuple, link)) {
-                isc_uint8_t alg;
-	        if (tuple->rdata.type != dns_rdatatype_dnskey ||
-                    tuple->op != DNS_DIFFOP_ADD)
+		isc_uint8_t alg;
+		if (tuple->rdata.type != dns_rdatatype_dnskey ||
+		    tuple->op != DNS_DIFFOP_ADD)
 			continue;
 
-                alg = tuple->rdata.data[3];
-                if (alg == DST_ALG_RSAMD5 || alg == DST_ALG_RSASHA1 ||
-                    alg == DST_ALG_DSA || alg == DST_ALG_ECC) {
-                        nseconly = ISC_TRUE;
-                        break;
-                }
+		alg = tuple->rdata.data[3];
+		if (alg == DST_ALG_RSAMD5 || alg == DST_ALG_RSASHA1 ||
+		    alg == DST_ALG_DSA || alg == DST_ALG_ECC) {
+			nseconly = ISC_TRUE;
+			break;
+		}
 	}
 
 	/* Check existing DB for NSEC-only DNSKEY */