diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index bfb7ced513..3c4a67c6d1 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.244 2009/10/12 20:48:10 each Exp $ */
+/* $Id: dnssec-signzone.c,v 1.245 2009/10/12 23:48:01 tbox Exp $ */
 
 /*! \file */
 
@@ -1735,7 +1735,7 @@ verifyzone(void) {
 			    (zsk_algorithms[i] != 0) ||
 			    (standby_zsk[i] != 0) ||
 			    (revoked_zsk[i] != 0)) {
- 				dns_secalg_format(i, algbuf, sizeof(algbuf));
+				dns_secalg_format(i, algbuf, sizeof(algbuf));
 				fprintf(stderr, "Algorithm: %s: KSKs: "
 					"%u active, %u stand-by, %u revoked\n",
 					algbuf, ksk_algorithms[i],
diff --git a/bin/named/include/named/control.h b/bin/named/include/named/control.h
index 0e68e397a6..c6baddcb2a 100644
--- a/bin/named/include/named/control.h
+++ b/bin/named/include/named/control.h
@@ -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) 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: control.h,v 1.26 2009/10/12 20:48:11 each Exp $ */
+/* $Id: control.h,v 1.27 2009/10/12 23:48:01 tbox Exp $ */
 
 #ifndef NAMED_CONTROL_H
 #define NAMED_CONTROL_H 1
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index b493a3b7dd..b2a893cbc1 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.157 2009/10/12 20:48:11 each Exp $ */
+/* $Id: zoneconf.c,v 1.158 2009/10/12 23:48:01 tbox Exp $ */
 
 /*% */
 
@@ -944,24 +944,24 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 		dns_zone_setoption(zone, DNS_ZONEOPT_SECURETOINSECURE,
 				   cfg_obj_asboolean(obj));
 
- 		obj = NULL;
- 		result = cfg_map_get(zoptions, "auto-dnssec", &obj);
- 		if (result == ISC_R_SUCCESS) {
- 			const char *arg = cfg_obj_asstring(obj);
- 			if (strcasecmp(arg, "allow") == 0)
- 				allow = ISC_TRUE;
- 			else if (strcasecmp(arg, "maintain") == 0)
- 				allow = maint = ISC_TRUE;
- 			else if (strcasecmp(arg, "create") == 0)
- 				allow = maint = create = ISC_TRUE;
- 			else if (strcasecmp(arg, "off") == 0)
- 				;
- 			else
- 				INSIST(0);
- 			dns_zone_setkeyopt(zone, DNS_ZONEKEY_ALLOW, allow);
- 			dns_zone_setkeyopt(zone, DNS_ZONEKEY_MAINTAIN, maint);
- 			dns_zone_setkeyopt(zone, DNS_ZONEKEY_CREATE, create);
- 		}
+		obj = NULL;
+		result = cfg_map_get(zoptions, "auto-dnssec", &obj);
+		if (result == ISC_R_SUCCESS) {
+			const char *arg = cfg_obj_asstring(obj);
+			if (strcasecmp(arg, "allow") == 0)
+				allow = ISC_TRUE;
+			else if (strcasecmp(arg, "maintain") == 0)
+				allow = maint = ISC_TRUE;
+			else if (strcasecmp(arg, "create") == 0)
+				allow = maint = create = ISC_TRUE;
+			else if (strcasecmp(arg, "off") == 0)
+				;
+			else
+				INSIST(0);
+			dns_zone_setkeyopt(zone, DNS_ZONEKEY_ALLOW, allow);
+			dns_zone_setkeyopt(zone, DNS_ZONEKEY_MAINTAIN, maint);
+			dns_zone_setkeyopt(zone, DNS_ZONEKEY_CREATE, create);
+		}
 	}
 
 	/*
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 457e710ad9..db360e2b5d 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.111 2009/10/12 20:48:11 each Exp $ */
+/* $Id: check.c,v 1.112 2009/10/12 23:48:01 tbox Exp $ */
 
 /*! \file */
 
@@ -1127,7 +1127,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
 	{ "masterfile-format", MASTERZONE | SLAVEZONE | STUBZONE | HINTZONE },
 	{ "update-check-ksk", MASTERZONE },
 	{ "dnskey-ksk-only", MASTERZONE },
- 	{ "auto-dnssec", MASTERZONE },
+	{ "auto-dnssec", MASTERZONE },
 	{ "try-tcp-refresh", SLAVEZONE },
 	};
 
diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index 1a2c0e903d..1b52ba32ea 100644
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dnssec.c,v 1.103 2009/10/12 20:48:11 each Exp $
+ * $Id: dnssec.c,v 1.104 2009/10/12 23:48:01 tbox Exp $
  */
 
 /*! \file */
@@ -1192,7 +1192,7 @@ addkey(dns_dnsseckeylist_t *keylist, dst_key_t **newkey,
 		if (dst_key_id(key->key) == dst_key_id(*newkey) &&
 		    dst_key_alg(key->key) == dst_key_alg(*newkey) &&
 		    dns_name_equal(dst_key_name(key->key),
-		    		   dst_key_name(*newkey)))
+				   dst_key_name(*newkey)))
 			break;
 	}
 
@@ -1432,7 +1432,7 @@ remove_key(dns_diff_t *del, dns_dnsseckey_t *key, dns_name_t *origin,
  * the zone will be added to the list for post-removal processing.
  */
 isc_result_t
-dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys, 
+dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys,
 		      dns_dnsseckeylist_t *removed, dns_name_t *origin,
 		      dns_ttl_t ttl, dns_diff_t *add, dns_diff_t *del,
 		      isc_boolean_t allzsk, isc_mem_t *mctx,
@@ -1534,10 +1534,10 @@ dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys,
 			 * zone now.
 			 */
 			key2->hint_publish = key1->hint_publish;
-			if (key2->source == dns_keysource_user && 
+			if (key2->source == dns_keysource_user &&
 			    (key2->hint_publish || key2->force_publish))
 				RETERR(publish_key(add, key2, origin, ttl,
-					           mctx, allzsk, report));
+						   mctx, allzsk, report));
 		}
 
 		key1 = ISC_LIST_NEXT(key1, link);
diff --git a/lib/dns/include/dns/dnssec.h b/lib/dns/include/dns/dnssec.h
index 83f5b54e1d..6e904ece25 100644
--- a/lib/dns/include/dns/dnssec.h
+++ b/lib/dns/include/dns/dnssec.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec.h,v 1.37 2009/10/12 20:48:12 each Exp $ */
+/* $Id: dnssec.h,v 1.38 2009/10/12 23:48:02 tbox Exp $ */
 
 #ifndef DNS_DNSSEC_H
 #define DNS_DNSSEC_H 1
@@ -283,7 +283,7 @@ dns_dnssec_keylistfromrdataset(dns_name_t *origin,
  */
 
 isc_result_t
-dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys, 
+dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys,
 		      dns_dnsseckeylist_t *removed, dns_name_t *origin,
 		      dns_ttl_t ttl, dns_diff_t *add, dns_diff_t *del,
 		      isc_boolean_t allzsk, isc_mem_t *mctx,
diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h
index 87a6af33c3..0d172f687c 100644
--- a/lib/dns/include/dns/result.h
+++ b/lib/dns/include/dns/result.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009  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.117 2009/10/12 20:48:12 each Exp $ */
+/* $Id: result.h,v 1.118 2009/10/12 23:48:02 tbox Exp $ */
 
 #ifndef DNS_RESULT_H
 #define DNS_RESULT_H 1
diff --git a/lib/dns/include/dns/secalg.h b/lib/dns/include/dns/secalg.h
index 38550e8757..43d9fb25e1 100644
--- a/lib/dns/include/dns/secalg.h
+++ b/lib/dns/include/dns/secalg.h
@@ -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  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: secalg.h,v 1.20 2009/10/12 20:48:12 each Exp $ */
+/* $Id: secalg.h,v 1.21 2009/10/12 23:48:02 tbox Exp $ */
 
 #ifndef DNS_SECALG_H
 #define DNS_SECALG_H 1
diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c
index fb981bd627..177b00be25 100644
--- a/lib/dns/rcode.c
+++ b/lib/dns/rcode.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009  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.10 2009/10/12 20:48:12 each Exp $ */
+/* $Id: rcode.c,v 1.11 2009/10/12 23:48:01 tbox Exp $ */
 
 #include <config.h>
 #include <ctype.h>
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 058f85cb54..f42cd99cca 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.516 2009/10/12 20:48:12 each Exp $ */
+/* $Id: zone.c,v 1.517 2009/10/12 23:48:01 tbox Exp $ */
 
 /*! \file */
 
@@ -13404,8 +13404,8 @@ zone_rekey(dns_zone_t *zone) {
 	result = ISC_R_SUCCESS;
 
  failure:
- 	dns_diff_clear(&add);
- 	dns_diff_clear(&del);
+	dns_diff_clear(&add);
+	dns_diff_clear(&del);
 
 	clear_keylist(&dnskeys, mctx);
 	clear_keylist(&keys, mctx);
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index b26798927a..96fac89dba 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: namedconf.c,v 1.108 2009/10/12 20:48:12 each Exp $ */
+/* $Id: namedconf.c,v 1.109 2009/10/12 23:48:02 tbox Exp $ */
 
 /*! \file */
 
@@ -530,7 +530,7 @@ static cfg_type_t cfg_type_bracketed_sockaddrlist = {
 	&cfg_rep_list, &cfg_type_sockaddr
 };
 
-static const char *autodnssec_enums[] = { "allow", "maintain", "create", 
+static const char *autodnssec_enums[] = { "allow", "maintain", "create",
 					  "off", NULL };
 static cfg_type_t cfg_type_autodnssec = {
 	"autodnssec", cfg_parse_enum, cfg_print_ustring, cfg_doc_enum,