diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index c93bac5615..fe3edb4988 100644
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.33 2008/03/31 14:42:50 fdupont Exp $
+# $Id: Makefile.in,v 1.34 2008/04/01 23:47:10 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/named/bind9.xsl b/bin/named/bind9.xsl
index 7f8a8cdf3e..97d75806d6 100644
--- a/bin/named/bind9.xsl
+++ b/bin/named/bind9.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- - Copyright (C) 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2006-2008  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 +15,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: bind9.xsl,v 1.14 2008/03/31 05:00:29 marka Exp $ -->
+<!-- $Id: bind9.xsl,v 1.15 2008/04/01 23:47:10 tbox Exp $ -->
 
 <xsl:stylesheet version="1.0"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/bin/named/update.c b/bin/named/update.c
index b26acccec3..1b3362e64c 100644
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.143 2008/04/01 01:37:24 marka Exp $ */
+/* $Id: update.c,v 1.144 2008/04/01 23:47:10 tbox Exp $ */
 
 #include <config.h>
 
@@ -1591,7 +1591,7 @@ has_opt_bit(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node) {
 	dns_rdata_t rdata = DNS_RDATA_INIT;
 	dns_rdataset_t rdataset;
 	isc_boolean_t has_bit = ISC_FALSE;
- 
+
 	dns_rdataset_init(&rdataset);
 	CHECK(dns_db_findrdataset(db, node, version, dns_rdatatype_nsec,
 				  dns_rdatatype_none, 0, &rdataset, NULL));
@@ -1843,7 +1843,7 @@ del_keysigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
 	isc_boolean_t found;
 
 fprintf(stderr, "del_keysigs\n");
- 
+
 	dns_rdataset_init(&rdataset);
 
 	result = dns_db_findnode(db, name, ISC_FALSE, &node);
@@ -1878,7 +1878,7 @@ fprintf(stderr, "del_keysigs\n");
 					 * Just skip the record for now.
 					 */
 					break;
-				} 
+				}
 				result = update_one_rr(db, ver, diff,
 						       DNS_DIFFOP_DEL, name,
 						       rdataset.ttl, &rdata);
@@ -2569,10 +2569,10 @@ add_signing_records(dns_db_t *db, dns_name_t *name, dns_dbversion_t *ver,
 		     (DNS_KEYFLAG_OWNERMASK|DNS_KEYTYPE_NOAUTH))
 			 != DNS_KEYOWNER_ZONE)
 			continue;
-	 
+
 		dns_rdata_toregion(&tuple->rdata, &r);
 		keyid = dst_region_computeid(&r, dnskey.algorithm);
-		
+
 		buf[0] = dnskey.algorithm;
 		buf[1] = (keyid & 0xff00) >> 8;
 		buf[2] = (keyid & 0xff);
@@ -3179,7 +3179,7 @@ update_action(isc_task_t *task, isc_event_t *event) {
 			isc_region_t r;
 			dns_secalg_t algorithm;
 			isc_uint16_t keyid;
-			
+
 			if (tuple->rdata.type != dns_rdatatype_dnskey ||
 			    tuple->op != DNS_DIFFOP_ADD)
 				continue;
@@ -3193,7 +3193,7 @@ update_action(isc_task_t *task, isc_event_t *event) {
 			dns_rdata_toregion(&tuple->rdata, &r);
 			algorithm = dnskey.algorithm;
 			keyid = dst_region_computeid(&r, algorithm);
-			
+
 			result = dns_zone_signwithkey(zone, algorithm, keyid);
 			if (result != ISC_R_SUCCESS) {
 				update_log(client, zone, ISC_LOG_ERROR,
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 83c2a4541c..270ad8a6f7 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2008  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.161 2008/04/01 05:19:00 marka Exp $
+# $Id: Makefile.in,v 1.162 2008/04/01 23:47:10 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/db.c b/lib/dns/db.c
index 34e1ba9a08..7d4d038d11 100644
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  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: db.c,v 1.85 2008/04/01 03:02:20 marka Exp $ */
+/* $Id: db.c,v 1.86 2008/04/01 23:47:10 tbox Exp $ */
 
 /*! \file */
 
@@ -95,7 +95,7 @@ static inline dns_dbimplementation_t *
 impfind(const char *name) {
 	dns_dbimplementation_t *imp;
 
-	for (imp = ISC_LIST_HEAD(implementations); 
+	for (imp = ISC_LIST_HEAD(implementations);
 	     imp != NULL;
 	     imp = ISC_LIST_NEXT(imp, link))
 		if (strcasecmp(name, imp->name) == 0)
@@ -558,10 +558,10 @@ dns_db_transfernode(dns_db_t *db, dns_dbnode_t **sourcep,
 	UNUSED(db);
 
 	if (db->methods->transfernode == NULL) {
-	 	*targetp = *sourcep;
-	 	*sourcep = NULL;
+		*targetp = *sourcep;
+		*sourcep = NULL;
 	} else
-	 	(db->methods->transfernode)(db, sourcep, targetp);
+		(db->methods->transfernode)(db, sourcep, targetp);
 
 	ENSURE(*sourcep == NULL);
 }
@@ -726,7 +726,7 @@ dns_db_deleterdataset(dns_db_t *db, dns_dbnode_t *node,
 					      type, covers));
 }
 
-void 
+void
 dns_db_overmem(dns_db_t *db, isc_boolean_t overmem) {
 
 	REQUIRE(DNS_DB_VALID(db));
@@ -752,11 +752,11 @@ dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, isc_uint32_t *serialp)
 	dns_rdataset_init(&rdataset);
 	result = dns_db_findrdataset(db, node, ver, dns_rdatatype_soa, 0,
 				     (isc_stdtime_t)0, &rdataset, NULL);
- 	if (result != ISC_R_SUCCESS)
+	if (result != ISC_R_SUCCESS)
 		goto freenode;
 
 	result = dns_rdataset_first(&rdataset);
- 	if (result != ISC_R_SUCCESS)
+	if (result != ISC_R_SUCCESS)
 		goto freerdataset;
 	dns_rdataset_current(&rdataset, &rdata);
 	result = dns_rdataset_next(&rdataset);
@@ -809,7 +809,7 @@ dns_db_register(const char *name, dns_dbcreatefunc_t create, void *driverarg,
 		RWUNLOCK(&implock, isc_rwlocktype_write);
 		return (ISC_R_EXISTS);
 	}
-	
+
 	imp = isc_mem_get(mctx, sizeof(dns_dbimplementation_t));
 	if (imp == NULL) {
 		RWUNLOCK(&implock, isc_rwlocktype_write);
diff --git a/lib/dns/diff.c b/lib/dns/diff.c
index 1cd4ced8d2..2e84f9c98e 100644
--- a/lib/dns/diff.c
+++ b/lib/dns/diff.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  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.15 2008/04/01 01:37:24 marka Exp $ */
+/* $Id: diff.c,v 1.16 2008/04/01 23:47:10 tbox Exp $ */
 
 /*! \file */
 
@@ -212,7 +212,7 @@ setresign(dns_rdataset_t *modified, dns_diffop_t op) {
 		when = sig.timesigned + delta;
 	}
 	dns_rdata_reset(&rdata);
-		
+
 	result = dns_rdataset_next(modified);
 	while (result == ISC_R_SUCCESS) {
 		dns_rdataset_current(modified, &rdata);
@@ -320,7 +320,7 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver,
 						      sizeof(classbuf));
 				if (t->ttl != rdl.ttl && warn)
 					isc_log_write(DIFF_COMMON_LOGARGS,
-					      	ISC_LOG_WARNING,
+						ISC_LOG_WARNING,
 						"'%s/%s/%s': TTL differs in "
 						"rdataset, adjusting "
 						"%lu -> %lu",
@@ -384,7 +384,7 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver,
 							      resign);
 				}
 			} else if (result == DNS_R_UNCHANGED) {
-			  	/*
+				/*
 				 * This will not happen when executing a
 				 * dynamic update, because that code will
 				 * generate strictly minimal diffs.
diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index b5313a788e..86864514b4 100644
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2008  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.13 2008/03/31 14:42:51 fdupont Exp $
+ * $Id: dst_api.c,v 1.14 2008/04/01 23:47:10 tbox Exp $
  */
 
 /*! \file */
@@ -665,7 +665,7 @@ isc_result_t
 dst_key_fromlabel(dns_name_t *name, int alg, unsigned int flags,
 		  unsigned int protocol, dns_rdataclass_t rdclass,
 		  const char *engine, const char *label, const char *pin,
-		  isc_mem_t *mctx, dst_key_t **keyp) 
+		  isc_mem_t *mctx, dst_key_t **keyp)
 {
 	dst_key_t *key;
 	isc_result_t result;
diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
index dbf6acb9fb..0c1a71c225 100644
--- a/lib/dns/dst_internal.h
+++ b/lib/dns/dst_internal.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2008  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.10 2008/03/31 14:42:51 fdupont Exp $ */
+/* $Id: dst_internal.h,v 1.11 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifndef DST_DST_INTERNAL_H
 #define DST_DST_INTERNAL_H 1
@@ -110,7 +110,7 @@ struct dst_key {
 		dst_hmacsha256_key_t *hmacsha256;
 		dst_hmacsha384_key_t *hmacsha384;
 		dst_hmacsha512_key_t *hmacsha512;
-		
+
 	} keydata;			/*%< pointer to key in crypto pkg fmt */
 	dst_func_t *	func;		/*%< crypto package specific functions */
 };
diff --git a/lib/dns/dst_openssl.h b/lib/dns/dst_openssl.h
index f902ef3e32..80eef93496 100644
--- a/lib/dns/dst_openssl.h
+++ b/lib/dns/dst_openssl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  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.6 2008/03/31 14:42:51 fdupont Exp $ */
+/* $Id: dst_openssl.h,v 1.7 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifndef DST_OPENSSL_H
 #define DST_OPENSSL_H 1
@@ -31,7 +31,7 @@ dst__openssl_toresult(isc_result_t fallback);
 ENGINE *
 dst__openssl_getengine(const char *name);
 
-isc_result_t 
+isc_result_t
 dst__openssl_setdefault(const char *name);
 
 ISC_LANG_ENDDECLS
diff --git a/lib/dns/dst_parse.h b/lib/dns/dst_parse.h
index 2340081bd6..3ed4ee1656 100644
--- a/lib/dns/dst_parse.h
+++ b/lib/dns/dst_parse.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2008  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_parse.h,v 1.9 2008/03/31 14:42:51 fdupont Exp $ */
+/* $Id: dst_parse.h,v 1.10 2008/04/01 23:47:10 tbox Exp $ */
 
 /*! \file */
 #ifndef DST_DST_PARSE_H
diff --git a/lib/dns/dst_result.c b/lib/dns/dst_result.c
index 6986237cf1..429dbb2fc1 100644
--- a/lib/dns/dst_result.c
+++ b/lib/dns/dst_result.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -17,7 +17,7 @@
 
 /*%
  * Principal Author: Brian Wellington
- * $Id: dst_result.c,v 1.6 2008/03/31 14:42:51 fdupont Exp $
+ * $Id: dst_result.c,v 1.7 2008/04/01 23:47:10 tbox Exp $
  */
 
 #include <config.h>
diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c
index 62aefe4067..fce98d708f 100644
--- a/lib/dns/hmac_link.c
+++ b/lib/dns/hmac_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2008  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.10 2008/03/31 14:42:51 fdupont Exp $
+ * $Id: hmac_link.c,v 1.11 2008/04/01 23:47:10 tbox Exp $
  */
 
 #include <config.h>
@@ -285,7 +285,7 @@ hmacmd5_parse(dst_key_t *key, isc_lex_t *lexer) {
 		switch (priv.elements[i].tag) {
 		case TAG_HMACMD5_KEY:
 			isc_buffer_init(&b, priv.elements[i].data,
-				        priv.elements[i].length);
+					priv.elements[i].length);
 			isc_buffer_add(&b, priv.elements[i].length);
 			tresult = hmacmd5_fromdns(key, &b);
 			if (tresult != ISC_R_SUCCESS)
@@ -555,7 +555,7 @@ hmacsha1_parse(dst_key_t *key, isc_lex_t *lexer) {
 		switch (priv.elements[i].tag) {
 		case TAG_HMACSHA1_KEY:
 			isc_buffer_init(&b, priv.elements[i].data,
-				        priv.elements[i].length);
+					priv.elements[i].length);
 			isc_buffer_add(&b, priv.elements[i].length);
 			tresult = hmacsha1_fromdns(key, &b);
 			if (tresult != ISC_R_SUCCESS)
@@ -825,7 +825,7 @@ hmacsha224_parse(dst_key_t *key, isc_lex_t *lexer) {
 		switch (priv.elements[i].tag) {
 		case TAG_HMACSHA224_KEY:
 			isc_buffer_init(&b, priv.elements[i].data,
-				        priv.elements[i].length);
+					priv.elements[i].length);
 			isc_buffer_add(&b, priv.elements[i].length);
 			tresult = hmacsha224_fromdns(key, &b);
 			if (tresult != ISC_R_SUCCESS)
@@ -1095,7 +1095,7 @@ hmacsha256_parse(dst_key_t *key, isc_lex_t *lexer) {
 		switch (priv.elements[i].tag) {
 		case TAG_HMACSHA256_KEY:
 			isc_buffer_init(&b, priv.elements[i].data,
-				        priv.elements[i].length);
+					priv.elements[i].length);
 			isc_buffer_add(&b, priv.elements[i].length);
 			tresult = hmacsha256_fromdns(key, &b);
 			if (tresult != ISC_R_SUCCESS)
@@ -1365,7 +1365,7 @@ hmacsha384_parse(dst_key_t *key, isc_lex_t *lexer) {
 		switch (priv.elements[i].tag) {
 		case TAG_HMACSHA384_KEY:
 			isc_buffer_init(&b, priv.elements[i].data,
-				        priv.elements[i].length);
+					priv.elements[i].length);
 			isc_buffer_add(&b, priv.elements[i].length);
 			tresult = hmacsha384_fromdns(key, &b);
 			if (tresult != ISC_R_SUCCESS)
@@ -1635,7 +1635,7 @@ hmacsha512_parse(dst_key_t *key, isc_lex_t *lexer) {
 		switch (priv.elements[i].tag) {
 		case TAG_HMACSHA512_KEY:
 			isc_buffer_init(&b, priv.elements[i].data,
-				        priv.elements[i].length);
+					priv.elements[i].length);
 			isc_buffer_add(&b, priv.elements[i].length);
 			tresult = hmacsha512_fromdns(key, &b);
 			if (tresult != ISC_R_SUCCESS)
diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 64c2f2eae5..6c5163ae1f 100644
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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: db.h,v 1.90 2008/04/01 01:37:25 marka Exp $ */
+/* $Id: db.h,v 1.91 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifndef DNS_DB_H
 #define DNS_DB_H 1
@@ -164,7 +164,7 @@ typedef isc_result_t
 		      dns_dbtype_t type, dns_rdataclass_t rdclass,
 		      unsigned int argc, char *argv[], void *driverarg,
 		      dns_db_t **dbp);
-					
+
 #define DNS_DB_MAGIC		ISC_MAGIC('D','N','S','D')
 #define DNS_DB_VALID(db)	ISC_MAGIC_VALID(db, DNS_DB_MAGIC)
 
@@ -811,7 +811,7 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
  *						the negative caching proof.
  *
  *	\li	#DNS_R_EMPTYNAME			The name exists but there is
- *						no data at the name. 
+ *						no data at the name.
  *
  *	\li	#DNS_R_COVERINGNSEC		The returned data is a NSEC
  *						that potentially covers 'name'.
@@ -909,7 +909,7 @@ dns_db_detachnode(dns_db_t *db, dns_dbnode_t **nodep);
  */
 
 void
-dns_db_transfernode(dns_db_t *db, dns_dbnode_t **sourcep, 
+dns_db_transfernode(dns_db_t *db, dns_dbnode_t **sourcep,
 		    dns_dbnode_t **targetp);
 /*%<
  * Transfer a node between pointer.
@@ -1377,7 +1377,7 @@ dns_db_resigned(dns_db_t *db, dns_rdataset_t *rdataset,
 		dns_dbversion_t *version);
 /*%<
  * Mark 'rdataset' as not being available to be returned by
- * dns_db_getsigningtime().  If the changes associated with 'version' 
+ * dns_db_getsigningtime().  If the changes associated with 'version'
  * are committed this will be permanent.  If the version is not committed
  * this change will be rolled back when the version is closed.
  *
diff --git a/lib/dns/include/dns/diff.h b/lib/dns/include/dns/diff.h
index 34ff64cf5a..db6ab1ecb6 100644
--- a/lib/dns/include/dns/diff.h
+++ b/lib/dns/include/dns/diff.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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: diff.h,v 1.13 2008/04/01 01:37:25 marka Exp $ */
+/* $Id: diff.h,v 1.14 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifndef DNS_DIFF_H
 #define DNS_DIFF_H 1
diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h
index 2f4601c283..72468f2374 100644
--- a/lib/dns/include/dns/journal.h
+++ b/lib/dns/include/dns/journal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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: journal.h,v 1.32 2008/04/01 01:37:25 marka Exp $ */
+/* $Id: journal.h,v 1.33 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifndef DNS_JOURNAL_H
 #define DNS_JOURNAL_H 1
diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h
index 787788a87c..e5e24c3352 100644
--- a/lib/dns/include/dns/master.h
+++ b/lib/dns/include/dns/master.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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: master.h,v 1.49 2008/04/01 01:37:25 marka Exp $ */
+/* $Id: master.h,v 1.50 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifndef DNS_MASTER_H
 #define DNS_MASTER_H 1
@@ -42,7 +42,7 @@
 #define DNS_MASTER_HINT 	0x00000010	/*%< Loading a hint master file. */
 #define DNS_MASTER_SLAVE 	0x00000020	/*%< Loading a slave master file. */
 #define DNS_MASTER_CHECKNS 	0x00000040	/*%<
-						 * Check NS records to see 
+						 * Check NS records to see
 						 * if they are an address
 						 */
 #define DNS_MASTER_FATALNS 	0x00000080	/*%<
diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h
index 53fec12393..69e777777f 100644
--- a/lib/dns/include/dns/masterdump.h
+++ b/lib/dns/include/dns/masterdump.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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: masterdump.h,v 1.40 2008/04/01 01:37:25 marka Exp $ */
+/* $Id: masterdump.h,v 1.41 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifndef DNS_MASTERDUMP_H
 #define DNS_MASTERDUMP_H 1
@@ -95,10 +95,10 @@ typedef struct dns_master_style dns_master_style_t;
 #define	DNS_STYLEFLAG_NO_TTL		0x01000000U
 
 /*% Never print the CLASS. */
-#define	DNS_STYLEFLAG_NO_CLASS		0x02000000U 
+#define	DNS_STYLEFLAG_NO_CLASS		0x02000000U
 
 /*% Report re-signing time. */
-#define	DNS_STYLEFLAG_RESIGN		0x04000000U 
+#define	DNS_STYLEFLAG_RESIGN		0x04000000U
 
 ISC_LANG_BEGINDECLS
 
@@ -122,8 +122,8 @@ LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_default;
 LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_full;
 
 /*%
- * A master file style that prints explicit TTL values on each 
- * record line, never using $TTL statements.  The TTL has a tab 
+ * A master file style that prints explicit TTL values on each
+ * record line, never using $TTL statements.  The TTL has a tab
  * stop of its own, but the class and type share one.
  */
 LIBDNS_EXTERNAL_DATA extern const dns_master_style_t
@@ -136,9 +136,9 @@ LIBDNS_EXTERNAL_DATA extern const dns_master_style_t
 LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_cache;
 
 /*%
- * A master style that prints name, ttl, class, type, and value on 
- * every line.  Similar to explicitttl above, but more verbose.  
- * Intended for generating master files which can be easily parsed 
+ * A master style that prints name, ttl, class, type, and value on
+ * every line.  Similar to explicitttl above, but more verbose.
+ * Intended for generating master files which can be easily parsed
  * by perl scripts and similar applications.
  */
 LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_simple;
@@ -234,7 +234,7 @@ dns_master_dumptostream2(isc_mem_t *mctx, dns_db_t *db,
  *\li	'task' to be valid.
  *\li	'done' to be non NULL.
  *\li	'dctxp' to be non NULL && '*dctxp' to be NULL.
- * 
+ *
  * Returns:
  *\li	ISC_R_SUCCESS
  *\li	ISC_R_CONTINUE	dns_master_dumptostreaminc() only.
diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index 24fce03ac7..36e83439a6 100644
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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: rdata.h,v 1.68 2008/04/01 01:37:25 marka Exp $ */
+/* $Id: rdata.h,v 1.69 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifndef DNS_RDATA_H
 #define DNS_RDATA_H 1
@@ -333,11 +333,11 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
  *\li	'target' is a valid region.
  *
  *\li	'origin' if non NULL it must be absolute.
- *	
+ *
  *\li	'callbacks' to be NULL or callbacks->warn and callbacks->error be
  *	initialized.
  *
- * Ensures, 
+ * Ensures,
  *	if result is success:
  *\li	 	If 'rdata' is not NULL, it is attached to the target.
 
diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index 92dfc12add..1ca8ea6b31 100644
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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.h,v 1.63 2008/04/01 01:37:25 marka Exp $ */
+/* $Id: rdataset.h,v 1.64 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifndef DNS_RDATASET_H
 #define DNS_RDATASET_H 1
@@ -157,7 +157,7 @@ struct dns_rdataset {
 	void *				private5;
 	void *				private6;
 	/*@}*/
-	
+
 };
 
 /*!
@@ -355,8 +355,8 @@ dns_rdataset_totext(dns_rdataset_t *rdataset,
  * Notes:
  *\li	The rdata cursor position will be changed.
  *
- *\li	The 'question' flag should normally be #ISC_FALSE.  If it is 
- *	#ISC_TRUE, the TTL and rdata fields are not printed.  This is 
+ *\li	The 'question' flag should normally be #ISC_FALSE.  If it is
+ *	#ISC_TRUE, the TTL and rdata fields are not printed.  This is
  *	for use when printing an rdata representing a question section.
  *
  *\li	This interface is deprecated; use dns_master_rdatasettottext()
diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h
index a76546b8f0..3ac44b879e 100644
--- a/lib/dns/include/dns/rdataslab.h
+++ b/lib/dns/include/dns/rdataslab.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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: rdataslab.h,v 1.32 2008/04/01 01:37:25 marka Exp $ */
+/* $Id: rdataslab.h,v 1.33 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifndef DNS_RDATASLAB_H
 #define DNS_RDATASLAB_H 1
@@ -153,10 +153,10 @@ dns_rdataslab_equal(unsigned char *slab1, unsigned char *slab2,
  */
 isc_boolean_t
 dns_rdataslab_equalx(unsigned char *slab1, unsigned char *slab2,
-		     unsigned int reservelen, dns_rdataclass_t rdclass, 
+		     unsigned int reservelen, dns_rdataclass_t rdclass,
 		     dns_rdatatype_t type);
 /*%<
- * Compare two rdataslabs for DNSSEC equality. 
+ * Compare two rdataslabs for DNSSEC equality.
  *
  * Requires:
  *\li	'slab1' and 'slab2' point to slabs.
diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h
index 2628740ebc..5d7159645e 100644
--- a/lib/dns/include/dst/dst.h
+++ b/lib/dns/include/dst/dst.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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.10 2008/03/31 14:42:51 fdupont Exp $ */
+/* $Id: dst.h,v 1.11 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifndef DST_DST_H
 #define DST_DST_H 1
@@ -436,9 +436,9 @@ dst_key_fromgssapi(dns_name_t *name, gss_ctx_id_t gssctx, isc_mem_t *mctx,
 
 isc_result_t
 dst_key_fromlabel(dns_name_t *name, int alg, unsigned int flags,
-                  unsigned int protocol, dns_rdataclass_t rdclass,
-                  const char *engine, const char *label, const char *pin,
-                  isc_mem_t *mctx, dst_key_t **keyp);
+		  unsigned int protocol, dns_rdataclass_t rdclass,
+		  const char *engine, const char *label, const char *pin,
+		  isc_mem_t *mctx, dst_key_t **keyp);
 
 isc_result_t
 dst_key_generate(dns_name_t *name, unsigned int alg,
diff --git a/lib/dns/include/dst/result.h b/lib/dns/include/dst/result.h
index 7478fe7444..d77b72e77a 100644
--- a/lib/dns/include/dst/result.h
+++ b/lib/dns/include/dst/result.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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: result.h,v 1.8 2008/03/31 14:42:51 fdupont Exp $ */
+/* $Id: result.h,v 1.9 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifndef DST_RESULT_H
 #define DST_RESULT_H 1
diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 9c540426e7..3c4ba77fd2 100644
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  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.100 2008/04/01 01:37:24 marka Exp $ */
+/* $Id: journal.c,v 1.101 2008/04/01 23:47:10 tbox Exp $ */
 
 #include <config.h>
 
@@ -41,7 +41,7 @@
 #include <dns/result.h>
 #include <dns/soa.h>
 
-/*! \file 
+/*! \file
  * \brief Journalling.
  *
  * A journal file consists of
@@ -107,7 +107,7 @@ static isc_boolean_t bind8_compat = ISC_TRUE; /* XXX config */
 	} while (0)
 
 #define CHECK(op) \
-     	do { result = (op); 					\
+	do { result = (op); 					\
 		if (result != ISC_R_SUCCESS) goto failure; 	\
 	} while (0)
 
@@ -149,11 +149,11 @@ dns_db_createsoatuple(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx,
 	dns_rdataset_init(&rdataset);
 	result = dns_db_findrdataset(db, node, ver, dns_rdatatype_soa, 0,
 				     (isc_stdtime_t)0, &rdataset, NULL);
- 	if (result != ISC_R_SUCCESS)
+	if (result != ISC_R_SUCCESS)
 		goto freenode;
 
 	result = dns_rdataset_first(&rdataset);
- 	if (result != ISC_R_SUCCESS)
+	if (result != ISC_R_SUCCESS)
 		goto freenode;
 
 	dns_rdataset_current(&rdataset, &rdata);
@@ -674,7 +674,7 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
 	isc_result_t result;
 	int namelen;
 	char backup[1024];
-	
+
 	result = journal_open(mctx, filename, write, write, journalp);
 	if (result == ISC_R_NOTFOUND) {
 		namelen = strlen(filename);
@@ -1306,7 +1306,7 @@ roll_forward(dns_journal_t *j, dns_db_t *db, unsigned int options) {
 					    DNS_DIFFOP_ADDRESIGN;
 		else
 			op = (n_soa == 1) ? DNS_DIFFOP_DEL : DNS_DIFFOP_ADD;
-		
+
 		CHECK(dns_difftuple_create(diff.mctx, op, name, ttl, rdata,
 					   &tuple));
 		dns_diff_append(&diff, &tuple);
@@ -2019,7 +2019,7 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial,
 		dns_journal_destroy(&j);
 		return (ISC_R_SUCCESS);
 	}
-		
+
 	if (DNS_SERIAL_GT(j->header.begin.serial, serial) ||
 	    DNS_SERIAL_GT(serial, j->header.end.serial)) {
 		dns_journal_destroy(&j);
@@ -2043,7 +2043,7 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial,
 	}
 
 	CHECK(journal_open(mctx, newname, ISC_TRUE, ISC_TRUE, &new));
-	
+
 	/*
 	 * Remove overhead so space test below can succeed.
 	 */
@@ -2101,7 +2101,7 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial,
 			result = ISC_R_NOMEMORY;
 			goto failure;
 		}
-	
+
 		CHECK(journal_seek(j, best_guess.offset));
 		CHECK(journal_seek(new, indexend));
 		for (i = 0; i < copy_length; i += size) {
@@ -2174,7 +2174,7 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial,
 			goto failure;
 		}
 	}
-		
+
 	dns_journal_destroy(&j);
 	result = ISC_R_SUCCESS;
 
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index e8a1895dd1..346cf8ab19 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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.90 2008/04/01 01:37:24 marka Exp $ */
+/* $Id: masterdump.c,v 1.91 2008/04/01 23:47:10 tbox Exp $ */
 
 /*! \file */
 
@@ -184,7 +184,7 @@ struct dns_dumpctx {
 					    isc_buffer_t *buffer, FILE *f);
 };
 
-#define NXDOMAIN(x) (((x)->attributes & DNS_RDATASETATTR_NXDOMAIN) != 0) 
+#define NXDOMAIN(x) (((x)->attributes & DNS_RDATASETATTR_NXDOMAIN) != 0)
 
 /*%
  * Output tabs and spaces to go from column '*current' to
@@ -1081,7 +1081,7 @@ dns_dumpctx_detach(dns_dumpctx_t **dctxp) {
 
 dns_dbversion_t *
 dns_dumpctx_version(dns_dumpctx_t *dctx) {
-        REQUIRE(DNS_DCTX_VALID(dctx));
+	REQUIRE(DNS_DCTX_VALID(dctx));
 	return (dctx->version);
 }
 
diff --git a/lib/dns/name.c b/lib/dns/name.c
index a067c13ac3..f4ea3e9113 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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.164 2008/03/31 05:00:30 marka Exp $ */
+/* $Id: name.c,v 1.165 2008/04/01 23:47:10 tbox Exp $ */
 
 /*! \file */
 
@@ -155,7 +155,7 @@ do { \
 static unsigned char root_ndata[] = { '\0' };
 static unsigned char root_offsets[] = { 0 };
 
-static dns_name_t root = 
+static dns_name_t root =
 {
 	DNS_NAME_MAGIC,
 	root_ndata, 1, 1,
@@ -298,7 +298,7 @@ dns_name_ismailbox(const dns_name_t *name) {
 	REQUIRE(name->labels > 0);
 	REQUIRE(name->attributes & DNS_NAMEATTR_ABSOLUTE);
 
-	/* 
+	/*
 	 * Root label.
 	 */
 	if (name->length == 1)
@@ -312,7 +312,7 @@ dns_name_ismailbox(const dns_name_t *name) {
 		if (!domainchar(ch))
 			return (ISC_FALSE);
 	}
-	
+
 	if (ndata == name->ndata + name->length)
 		return (ISC_FALSE);
 
@@ -347,8 +347,8 @@ dns_name_ishostname(const dns_name_t *name, isc_boolean_t wildcard) {
 	REQUIRE(VALID_NAME(name));
 	REQUIRE(name->labels > 0);
 	REQUIRE(name->attributes & DNS_NAMEATTR_ABSOLUTE);
-	
-	/* 
+
+	/*
 	 * Root label.
 	 */
 	if (name->length == 1)
@@ -918,7 +918,7 @@ dns_name_getlabelsequence(const dns_name_t *source,
 
 	target->ndata = &source->ndata[firstoffset];
 	target->length = endoffset - firstoffset;
-	
+
 	if (first + n == source->labels && n > 0 &&
 	    (source->attributes & DNS_NAMEATTR_ABSOLUTE) != 0)
 		target->attributes |= DNS_NAMEATTR_ABSOLUTE;
@@ -991,7 +991,7 @@ dns_name_fromregion(dns_name_t *name, const isc_region_t *r) {
 		name->length = len;
 	} else {
 		name->ndata = r->base;
-		name->length = (r->length <= DNS_NAME_MAXWIRE) ? 
+		name->length = (r->length <= DNS_NAME_MAXWIRE) ?
 			r->length : DNS_NAME_MAXWIRE;
 	}
 
@@ -1049,7 +1049,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
 	REQUIRE(ISC_BUFFER_VALID(source));
 	REQUIRE((target != NULL && ISC_BUFFER_VALID(target)) ||
 		(target == NULL && ISC_BUFFER_VALID(name->buffer)));
-	
+
 	downcase = ISC_TF((options & DNS_NAME_DOWNCASE) != 0);
 
 	if (target == NULL && name->buffer != NULL) {
@@ -1305,7 +1305,7 @@ totext_filter_proc_key_init(void) {
 			goto unlock;
 		isc_mem_setname(thread_key_mctx, "threadkey", NULL);
 		isc_mem_setdestroycheck(thread_key_mctx, ISC_FALSE);
-		
+
 		if (!thread_key_initialized &&
 		     isc_thread_key_create(&totext_filter_proc_key,
 					   free_specific) != 0) {
@@ -2300,7 +2300,7 @@ dns_name_settotextfilter(dns_name_totextfilter_t proc) {
 			result = ISC_R_UNEXPECTED;
 		return (result);
 	}
-	
+
 	mem = isc_mem_get(thread_key_mctx, sizeof(*mem));
 	if (mem == NULL)
 		return (ISC_R_NOMEMORY);
diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index f6ff3a9f2a..3b8720291f 100644
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2008  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.17 2008/03/31 14:42:51 fdupont Exp $
+ * $Id: openssl_link.c,v 1.18 2008/04/01 23:47:10 tbox Exp $
  */
 #ifdef OPENSSL
 
@@ -81,8 +81,8 @@ static ENGINE *he;
 #ifdef USE_PKCS11
 static isc_result_t
 dst__openssl_load_engine(const char *name, const char *engine_id,
-	         	 const char **pre_cmds, int pre_num,
-		 	 const char **post_cmds, int post_num);
+		 	 const char **pre_cmds, int pre_num,
+			 const char **post_cmds, int post_num);
 #endif
 
 static int
@@ -250,7 +250,7 @@ dst__openssl_init() {
 	} else {
 		ENGINE_register_all_complete();
 		for (e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e)) {
-		
+
 			/*
 			 * Something wierd here. If we call ENGINE_finish()
 			 * ENGINE_get_default_RAND() will fail.
@@ -273,7 +273,7 @@ dst__openssl_init() {
 		ENGINE_free(re);
 	} else
 		ENGINE_finish(re);
-	
+
 #else
 	RAND_set_rand_method(rm);
 #endif /* USE_ENGINE */
@@ -388,8 +388,8 @@ dst__openssl_setdefault(const char *name) {
  */
 static isc_result_t
 dst__openssl_load_engine(const char *name, const char *engine_id,
-	         	 const char **pre_cmds, int pre_num,
-		 	 const char **post_cmds, int post_num)
+		 	 const char **pre_cmds, int pre_num,
+			 const char **post_cmds, int post_num)
 {
 	ENGINE *e;
 
diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c
index c3dc1dcd7c..abc3b7c2b3 100644
--- a/lib/dns/openssldh_link.c
+++ b/lib/dns/openssldh_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2008  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.13 2008/03/31 14:42:51 fdupont Exp $
+ * $Id: openssldh_link.c,v 1.14 2008/04/01 23:47:10 tbox Exp $
  */
 
 #ifdef OPENSSL
@@ -152,7 +152,7 @@ openssldh_paramcompare(const dst_key_t *key1, const dst_key_t *key2) {
 static isc_result_t
 openssldh_generate(dst_key_t *key, int generator) {
 #if OPENSSL_VERSION_NUMBER > 0x00908000L
-        BN_GENCB cb;
+	BN_GENCB cb;
 #endif
 	DH *dh = NULL;
 
diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
index eca7507a75..f4eb1125d9 100644
--- a/lib/dns/openssldsa_link.c
+++ b/lib/dns/openssldsa_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2008  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.12 2008/03/31 14:42:51 fdupont Exp $ */
+/* $Id: openssldsa_link.c,v 1.13 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifdef OPENSSL
 #ifndef USE_EVP
@@ -59,7 +59,7 @@ static isc_result_t
 openssldsa_createctx(dst_key_t *key, dst_context_t *dctx) {
 #if USE_EVP
 	EVP_MD_CTX *evp_md_ctx;
-	
+
 	UNUSED(key);
 
 	evp_md_ctx = EVP_MD_CTX_create();
@@ -138,8 +138,8 @@ openssldsa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
 	isc_region_t r;
 	DSA_SIG *dsasig;
 #if USE_EVP
-        EVP_MD_CTX *evp_md_ctx = dctx->ctxdata.evp_md_ctx;
-        EVP_PKEY *pkey;
+	EVP_MD_CTX *evp_md_ctx = dctx->ctxdata.evp_md_ctx;
+	EVP_PKEY *pkey;
 	unsigned char *sigbuf;
 	const unsigned char *sb;
 	unsigned int siglen;
@@ -316,7 +316,7 @@ openssldsa_compare(const dst_key_t *key1, const dst_key_t *key2) {
 static isc_result_t
 openssldsa_generate(dst_key_t *key, int unused) {
 #if OPENSSL_VERSION_NUMBER > 0x00908000L
-        BN_GENCB cb;
+	BN_GENCB cb;
 #endif
 	DSA *dsa;
 	unsigned char rand_array[ISC_SHA1_DIGESTLENGTH];
@@ -330,12 +330,12 @@ openssldsa_generate(dst_key_t *key, int unused) {
 		return (result);
 
 #if OPENSSL_VERSION_NUMBER > 0x00908000L
-        dsa = DSA_new();
+	dsa = DSA_new();
 	if (dsa == NULL)
 		return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
 
 	BN_GENCB_set_old(&cb, NULL, NULL);
-  
+
 	if (!DSA_generate_parameters_ex(dsa, key->key_size, rand_array,
 					ISC_SHA1_DIGESTLENGTH,  NULL, NULL,
 					&cb))
diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index c71657448b..26d63f8ad7 100644
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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.18 2008/04/01 00:03:31 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.19 2008/04/01 23:47:10 tbox Exp $
  */
 #ifdef OPENSSL
 #ifndef USE_EVP
@@ -57,7 +57,7 @@
 #ifdef WIN32
 #if !((OPENSSL_VERSION_NUMBER >= 0x009070cfL && \
        OPENSSL_VERSION_NUMBER < 0x00908000L) || \
-      OPENSSL_VERSION_NUMBER >= 0x0090804fL) 
+      OPENSSL_VERSION_NUMBER >= 0x0090804fL)
 #error Please upgrade OpenSSL to 0.9.8d/0.9.7l or greater.
 #endif
 #endif
@@ -196,7 +196,7 @@ static isc_result_t
 opensslrsa_adddata(dst_context_t *dctx, const isc_region_t *data) {
 #if USE_EVP
 	EVP_MD_CTX *evp_md_ctx = dctx->ctxdata.evp_md_ctx;
-#endif 
+#endif
 
 	REQUIRE(dctx->key->key_alg == DST_ALG_RSAMD5 ||
 		dctx->key->key_alg == DST_ALG_RSASHA1);
@@ -427,7 +427,7 @@ opensslrsa_generate(dst_key_t *key, int exp) {
 		SET_FLAGS(rsa);
 #if USE_EVP
 		key->keydata.pkey = pkey;
-		
+
 		RSA_free(rsa);
 #else
 		key->keydata.rsa = rsa;
@@ -450,7 +450,7 @@ err:
 	unsigned long e;
 #if USE_EVP
 	EVP_PKEY *pkey = EVP_PKEY_new();
-	
+
 	if (pkey == NULL)
 		return (ISC_R_NOMEMORY);
 #endif
@@ -731,7 +731,7 @@ opensslrsa_tofile(const dst_key_t *key, const char *directory) {
 		priv.elements[i].data = bufs[i];
 		i++;
 	}
-	
+
 	if (key->engine != NULL) {
 		priv.elements[i].tag = TAG_RSA_ENGINE;
 		priv.elements[i].length = strlen(key->engine) + 1;
@@ -820,7 +820,7 @@ opensslrsa_parse(dst_key_t *key, isc_lex_t *lexer) {
 #endif
 		dst__privstruct_free(&priv, mctx);
 		return (ISC_R_SUCCESS);
-	} 
+	}
 
 	rsa = RSA_new();
 	if (rsa == NULL)
@@ -853,7 +853,7 @@ opensslrsa_parse(dst_key_t *key, isc_lex_t *lexer) {
 				       priv.elements[i].length, NULL);
 			if (bn == NULL)
 				DST_RET(ISC_R_NOMEMORY);
-		} 
+		}
 
 		switch (priv.elements[i].tag) {
 			case TAG_RSA_MODULUS:
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index a4460a9b71..8eaff9a742 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.253 2008/04/01 01:37:24 marka Exp $ */
+/* $Id: rbtdb.c,v 1.254 2008/04/01 23:47:10 tbox Exp $ */
 
 /*! \file */
 
@@ -263,7 +263,7 @@ typedef struct rdatasetheader {
 	/*%<
 	 * Used for TTL-based cache cleaning.
 	 */
-        isc_stdtime_t                   resign;
+	isc_stdtime_t                   resign;
 } rdatasetheader_t;
 
 typedef ISC_LIST(rdatasetheader_t)      rdatasetheaderlist_t;
@@ -312,7 +312,7 @@ struct acachectl {
 #define NXDOMAIN(header) \
 	(((header)->attributes & RDATASET_ATTR_NXDOMAIN) != 0)
 #define RESIGN(header) \
-        (((header)->attributes & RDATASET_ATTR_RESIGN) != 0)
+	(((header)->attributes & RDATASET_ATTR_RESIGN) != 0)
 
 #define DEFAULT_NODE_LOCK_COUNT         7       /*%< Should be prime. */
 #define DEFAULT_CACHE_NODE_LOCK_COUNT   1009    /*%< Should be prime. */
@@ -432,7 +432,7 @@ typedef struct {
 
 	/* Locked by tree_lock. */
 	dns_rbt_t *                     tree;
-        dns_db_secure_t                 secure;
+	dns_db_secure_t                 secure;
 
 	/* Unlocked */
 	unsigned int                    quantum;
@@ -705,12 +705,12 @@ ttl_sooner(void *v1, void *v2) {
 
 static isc_boolean_t
 resign_sooner(void *v1, void *v2) {
-        rdatasetheader_t *h1 = v1;
-        rdatasetheader_t *h2 = v2;
+	rdatasetheader_t *h1 = v1;
+	rdatasetheader_t *h2 = v2;
 
-        if (h1->resign < h2->resign)
-                return (ISC_TRUE);
-        return (ISC_FALSE);
+	if (h1->resign < h2->resign)
+		return (ISC_TRUE);
+	return (ISC_FALSE);
 }
 
 /*%
@@ -856,7 +856,7 @@ free_rbtdb(dns_rbtdb_t *rbtdb, isc_boolean_t log, isc_event_t *event) {
 	}
 
 	/*
-         * Clean up LRU / re-signing order lists.
+	 * Clean up LRU / re-signing order lists.
 	 */
 	if (rbtdb->rdatasets != NULL) {
 		for (i = 0; i < rbtdb->node_lock_count; i++)
@@ -875,7 +875,7 @@ free_rbtdb(dns_rbtdb_t *rbtdb, isc_boolean_t log, isc_event_t *event) {
 		    rbtdb->node_lock_count * sizeof(rbtnodelist_t));
 	}
 	/*
-         * Clean up heap objects.
+	 * Clean up heap objects.
 	 */
 	if (rbtdb->heaps != NULL) {
 		for (i = 0; i < rbtdb->node_lock_count; i++)
@@ -1033,7 +1033,7 @@ allocate_version(isc_mem_t *mctx, rbtdb_serial_t serial,
 	version->writer = writer;
 	version->commit_ok = ISC_FALSE;
 	ISC_LIST_INIT(version->changed_list);
-        ISC_LIST_INIT(version->resigned_list);
+	ISC_LIST_INIT(version->resigned_list);
 	ISC_LINK_INIT(version, link);
 
 	return (version);
@@ -1737,7 +1737,7 @@ iszonesecure(dns_db_t *db, dns_dbnode_t *origin) {
 	dns_rdata_t rdata = DNS_RDATA_INIT;
 	isc_boolean_t haszonekey = ISC_FALSE;
 	isc_boolean_t hasnsec = ISC_FALSE;
-        isc_boolean_t hasoptbit = ISC_FALSE;
+	isc_boolean_t hasoptbit = ISC_FALSE;
 	isc_result_t result;
 
 	dns_rdataset_init(&keyset);
@@ -1757,7 +1757,7 @@ iszonesecure(dns_db_t *db, dns_dbnode_t *origin) {
 		dns_rdataset_disassociate(&keyset);
 	}
 	if (!haszonekey)
-                return (dns_db_insecure);
+		return (dns_db_insecure);
 
 	dns_rdataset_init(&nsecset);
 	dns_rdataset_init(&signsecset);
@@ -1779,7 +1779,7 @@ iszonesecure(dns_db_t *db, dns_dbnode_t *origin) {
 
 	if (hasnsec && hasoptbit)
 		return (dns_db_partial);
-        return (hasnsec ? dns_db_secure : dns_db_insecure);
+	return (hasnsec ? dns_db_secure : dns_db_insecure);
 }
 
 static void
@@ -1892,7 +1892,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
 			PREPEND(rbtdb->open_versions,
 				rbtdb->current_version, link);
 			resigned_list = version->resigned_list;
-                        ISC_LIST_INIT(version->resigned_list);
+			ISC_LIST_INIT(version->resigned_list);
 		} else {
 			/*
 			 * We're rolling back this transaction.
@@ -1900,7 +1900,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
 			cleanup_list = version->changed_list;
 			ISC_LIST_INIT(version->changed_list);
 			resigned_list = version->resigned_list;
-                        ISC_LIST_INIT(version->resigned_list);
+			ISC_LIST_INIT(version->resigned_list);
 			rollback = ISC_TRUE;
 			cleanup_version = version;
 			rbtdb->future_version = NULL;
@@ -1969,11 +1969,11 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
 	     header = HEAD(resigned_list)) {
 		ISC_LIST_UNLINK(resigned_list, header, lru_link);
 		if (rollback) {
-                        nodelock_t *lock;
-                        lock = &rbtdb->node_locks[header->node->locknum].lock;
-                        NODE_LOCK(lock, isc_rwlocktype_write);
+			nodelock_t *lock;
+			lock = &rbtdb->node_locks[header->node->locknum].lock;
+			NODE_LOCK(lock, isc_rwlocktype_write);
 			resign_insert(rbtdb, header->node->locknum, header);
-                        NODE_UNLOCK(lock, isc_rwlocktype_write);
+			NODE_UNLOCK(lock, isc_rwlocktype_write);
 		}
 		decrement_reference(rbtdb, header->node, least_serial,
 				    isc_rwlocktype_write,
@@ -3065,7 +3065,7 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 		 * If we're here, then the name does not exist, is not
 		 * beneath a zonecut, and there's no matching wildcard.
 		 */
-                if (search.rbtdb->secure == dns_db_secure ||
+		if (search.rbtdb->secure == dns_db_secure ||
 		    (search.options & DNS_DBFIND_FORCENSEC) != 0)
 		{
 			result = find_closest_nsec(&search, nodep, foundname,
@@ -3294,7 +3294,7 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 		 * The desired type doesn't exist.
 		 */
 		result = DNS_R_NXRRSET;
-                if (search.rbtdb->secure == dns_db_secure &&
+		if (search.rbtdb->secure == dns_db_secure &&
 		    (nsecheader == NULL || nsecsig == NULL)) {
 			/*
 			 * The zone is secure but there's no NSEC,
@@ -3309,7 +3309,7 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 			NODE_UNLOCK(lock, isc_rwlocktype_read);
 			result = find_closest_nsec(&search, nodep, foundname,
 						   rdataset, sigrdataset,
-                                                   search.rbtdb->secure ==
+						   search.rbtdb->secure ==
 						   dns_db_secure);
 			if (result == ISC_R_SUCCESS)
 				result = DNS_R_EMPTYWILD;
@@ -3329,7 +3329,7 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 			new_reference(search.rbtdb, node);
 			*nodep = node;
 		}
-                if (search.rbtdb->secure == dns_db_secure ||
+		if (search.rbtdb->secure == dns_db_secure ||
 		    (search.options & DNS_DBFIND_FORCENSEC) != 0)
 		{
 			bind_rdataset(search.rbtdb, node, nsecheader,
@@ -4618,12 +4618,12 @@ printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) {
 				first = ISC_FALSE;
 				fprintf(out,
 					"\tserial = %lu, ttl = %u, "
-                                        "trust = %u, attributes = %u, "
+					"trust = %u, attributes = %u, "
 					"resign = %u\n",
 					(unsigned long)current->serial,
 					current->rdh_ttl,
 					current->trust,
-                                        current->attributes,
+					current->attributes,
 					current->resign);
 				current = current->down;
 			} while (current != NULL);
@@ -6073,7 +6073,7 @@ issecure(dns_db_t *db) {
 	REQUIRE(VALID_RBTDB(rbtdb));
 
 	RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
-        secure = ISC_TF(rbtdb->secure == dns_db_secure);
+	secure = ISC_TF(rbtdb->secure == dns_db_secure);
 	RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
 
 	return (secure);
@@ -6081,18 +6081,18 @@ issecure(dns_db_t *db) {
 
 static isc_boolean_t
 isdnssec(dns_db_t *db) {
-        dns_rbtdb_t *rbtdb;
-        isc_boolean_t dnssec;
+	dns_rbtdb_t *rbtdb;
+	isc_boolean_t dnssec;
 
-        rbtdb = (dns_rbtdb_t *)db;
+	rbtdb = (dns_rbtdb_t *)db;
 
-        REQUIRE(VALID_RBTDB(rbtdb));
+	REQUIRE(VALID_RBTDB(rbtdb));
 
-        RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
-        dnssec = ISC_TF(rbtdb->secure != dns_db_insecure);
-        RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
+	RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
+	dnssec = ISC_TF(rbtdb->secure != dns_db_insecure);
+	RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
 
-        return (dnssec);
+	return (dnssec);
 }
 
 static unsigned int
@@ -6174,7 +6174,7 @@ setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) {
 
 	NODE_LOCK(&rbtdb->node_locks[header->node->locknum].lock,
 		  isc_rwlocktype_write);
-	
+
 	oldresign = header->resign;
 	header->resign = resign;
 	if (header->heap_index != 0) {
@@ -6342,11 +6342,11 @@ static dns_dbmethods_t cache_methods = {
 	overmem,
 	settask,
 	getoriginnode,
-        NULL,
-        NULL,
 	NULL,
 	NULL,
-        isdnssec
+	NULL,
+	NULL,
+	isdnssec
 };
 
 isc_result_t
@@ -6551,7 +6551,7 @@ dns_rbtdb_create
 		return (result);
 	}
 	rbtdb->attributes = 0;
-        rbtdb->secure = dns_db_insecure;
+	rbtdb->secure = dns_db_insecure;
 	rbtdb->overmem = ISC_FALSE;
 	rbtdb->task = NULL;
 
@@ -6725,15 +6725,15 @@ rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
 	raw += 2;
 #endif
 	if (rdataset->type == dns_rdatatype_rrsig) {
-		flags = ((*raw & DNS_RDATASLAB_WARNMASK) 
+		flags = ((*raw & DNS_RDATASLAB_WARNMASK)
 			  >> DNS_RDATASLAB_WARNSHIFT)
 			 << DNS_RDATA_WARNSHIFT;
 		if (*raw & DNS_RDATASLAB_OFFLINE)
 			flags |= DNS_RDATA_OFFLINE;
-                length--;
-                raw++;
+		length--;
+		raw++;
 	}
-        r.length = length;
+	r.length = length;
 	r.base = raw;
 	dns_rdata_fromregion(rdata, rdataset->rdclass, rdataset->type, &r);
 	rdata->flags |= flags;
diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 2f1e934f80..3366dd6073 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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: rdata.c,v 1.197 2008/04/01 01:37:25 marka Exp $ */
+/* $Id: rdata.c,v 1.198 2008/04/01 23:47:10 tbox Exp $ */
 
 /*! \file */
 
@@ -111,7 +111,7 @@ typedef struct dns_rdata_textctx {
 	dns_name_t *origin;	/*%< Current origin, or NULL. */
 	unsigned int flags;	/*%< DNS_STYLEFLAG_*  */
 	unsigned int width;	/*%< Width of rdata column. */
-  	const char *linebreak;	/*%< Line break string. */
+	const char *linebreak;	/*%< Line break string. */
 } dns_rdata_textctx_t;
 
 static isc_result_t
@@ -533,7 +533,7 @@ unknown_fromtext(dns_rdataclass_t rdclass, dns_rdatatype_t type,
 	result = isc_buffer_allocate(mctx, &buf, token.value.as_ulong);
 	if (result != ISC_R_SUCCESS)
 		return (result);
-	
+
 	result = isc_hex_tobuffer(lexer, buf,
 				  (unsigned int)token.value.as_ulong);
 	if (result != ISC_R_SUCCESS)
@@ -1505,16 +1505,16 @@ byte_btoa(int c, isc_buffer_t *target, struct state *state) {
 			   /*
 			    * Because some don't support u_long.
 			    */
-		    	tmp = 32;
-		    	tmpword -= (isc_int32_t)(85 * 85 * 85 * 85 * 32);
+			tmp = 32;
+			tmpword -= (isc_int32_t)(85 * 85 * 85 * 85 * 32);
 		    }
 		    if (tmpword < 0) {
-		    	tmp = 64;
-		    	tmpword -= (isc_int32_t)(85 * 85 * 85 * 85 * 32);
+			tmp = 64;
+			tmpword -= (isc_int32_t)(85 * 85 * 85 * 85 * 32);
 		    }
 			if (tr.length < 5)
 				return (ISC_R_NOSPACE);
-		    	tr.base[0] = atob_digits[(tmpword /
+			tr.base[0] = atob_digits[(tmpword /
 					      (isc_int32_t)(85 * 85 * 85 * 85))
 						+ tmp];
 			tmpword %= (isc_int32_t)(85 * 85 * 85 * 85);
@@ -1597,7 +1597,7 @@ warn_badmx(isc_token_t *token, isc_lex_t *lexer,
 	if (lexer != NULL) {
 		file = isc_lex_getsourcename(lexer);
 		line = isc_lex_getsourceline(lexer);
-		(*callbacks->warn)(callbacks, "%s:%u: warning: '%s': %s", 
+		(*callbacks->warn)(callbacks, "%s:%u: warning: '%s': %s",
 				   file, line, DNS_AS_STR(*token),
 				   dns_result_totext(DNS_R_MXISADDRESS));
 	}
@@ -1610,12 +1610,12 @@ warn_badname(dns_name_t *name, isc_lex_t *lexer,
 	const char *file;
 	unsigned long line;
 	char namebuf[DNS_NAME_FORMATSIZE];
-	
+
 	if (lexer != NULL) {
 		file = isc_lex_getsourcename(lexer);
 		line = isc_lex_getsourceline(lexer);
 		dns_name_format(name, namebuf, sizeof(namebuf));
-		(*callbacks->warn)(callbacks, "%s:%u: warning: %s: %s", 
+		(*callbacks->warn)(callbacks, "%s:%u: warning: %s: %s",
 				   file, line, namebuf,
 				   dns_result_totext(DNS_R_BADNAME));
 	}
diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 810535f5ae..4b8a4bfee6 100644
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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.80 2008/04/01 01:37:25 marka Exp $ */
+/* $Id: rdataset.c,v 1.81 2008/04/01 23:47:10 tbox Exp $ */
 
 /*! \file */
 
@@ -138,7 +138,7 @@ question_disassociate(dns_rdataset_t *rdataset) {
 static isc_result_t
 question_cursor(dns_rdataset_t *rdataset) {
 	UNUSED(rdataset);
-	
+
 	return (ISC_R_NOMORE);
 }
 
@@ -149,7 +149,7 @@ question_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
 	 */
 	UNUSED(rdataset);
 	UNUSED(rdata);
-	
+
 	REQUIRE(0);
 }
 
@@ -446,7 +446,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
 		/*
 		 * Copy out the name, type, class, ttl.
 		 */
-		
+
 		rrbuffer = *target;
 		dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
 		result = dns_name_towire(owner_name, cctx, target);
diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index d69714e2c6..8e67641803 100644
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataslab.c,v 1.44 2008/04/01 01:37:25 marka Exp $ */
+/* $Id: rdataslab.c,v 1.45 2008/04/01 23:47:10 tbox Exp $ */
 
 /*! \file */
 
@@ -261,7 +261,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
 		result = ISC_R_NOMEMORY;
 		goto free_rdatas;
 	}
-	
+
 #if DNS_RDATASET_FIXED
 	/* Allocate temporary offset table. */
 	offsettable = isc_mem_get(mctx, nalloc * sizeof(unsigned int));
@@ -318,7 +318,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
 		memcpy(rawbuf, x[i].rdata.data, x[i].rdata.length);
 		rawbuf += x[i].rdata.length;
 	}
-	
+
 #if DNS_RDATASET_FIXED
 	fillin_offsets(offsetbase, offsettable, nalloc);
 	isc_mem_put(mctx, offsettable, nalloc * sizeof(unsigned int));
@@ -400,7 +400,7 @@ rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
 	raw += 4;
 #else
 	raw += 2;
-#endif 
+#endif
 	if (rdataset->type == dns_rdatatype_rrsig) {
 		flags = ((*raw & DNS_RDATASLAB_WARNMASK)
 			  >> DNS_RDATASLAB_WARNSHIFT)
@@ -568,7 +568,7 @@ rdata_in_slab(unsigned char *slab, unsigned int reservelen,
 
 	for (i = 0; i < count; i++) {
 		rdata_from_slab(&current, rdclass, type, &trdata);
-		
+
 		n = dns_rdata_compare(&trdata, rdata);
 		if (n == 0)
 			return (ISC_TRUE);
diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index 22e8eb8105..9992cf2426 100644
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2005-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2005-2008  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.15 2008/04/01 01:37:25 marka Exp $ */
+/* $Id: sdlz.c,v 1.16 2008/04/01 23:47:10 tbox Exp $ */
 
 /*! \file */
 
@@ -1332,7 +1332,7 @@ dns_sdlzallowzonexfr(void *driverarg, void *dbdata, isc_mem_t *mctx,
 		return (result);
 	isc_buffer_putuint8(&b2, 0);
 
-        /* make sure strings are always lowercase */
+	/* make sure strings are always lowercase */
 	dns_sdlz_tolower(namestr);
 	dns_sdlz_tolower(clientstr);
 
@@ -1445,7 +1445,7 @@ dns_sdlzfindzone(void *driverarg, void *dbdata, isc_mem_t *mctx,
 		return (result);
 	isc_buffer_putuint8(&b, 0);
 
-        /* make sure strings are always lowercase */
+	/* make sure strings are always lowercase */
 	dns_sdlz_tolower(namestr);
 
 	/* Call SDLZ driver's find zone method */
@@ -1576,7 +1576,7 @@ dns_sdlz_putrr(dns_sdlzlookup_t *lookup, const char *type, dns_ttl_t ttl,
 	return (ISC_R_SUCCESS);
 
  failure:
- 	if (rdatabuf != NULL)
+	if (rdatabuf != NULL)
 		isc_buffer_free(&rdatabuf);
 	if (lex != NULL)
 		isc_lex_destroy(&lex);
diff --git a/lib/dns/view.c b/lib/dns/view.c
index 4cfbcc26ca..3a4489b8b2 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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.144 2008/03/31 05:00:30 marka Exp $ */
+/* $Id: view.c,v 1.145 2008/04/01 23:47:10 tbox Exp $ */
 
 /*! \file */
 
@@ -322,7 +322,7 @@ destroy(dns_view_t *view) {
 			name = ISC_LIST_HEAD(view->rootexclude[i]);
 			while (name != NULL) {
 				ISC_LIST_UNLINK(view->rootexclude[i],
-					 	name, link);
+						name, link);
 				dns_name_free(name, view->mctx);
 				isc_mem_put(view->mctx, name, sizeof(*name));
 				name = ISC_LIST_HEAD(view->rootexclude[i]);
@@ -944,7 +944,7 @@ dns_view_simplefind(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
 isc_result_t
 dns_view_findzonecut(dns_view_t *view, dns_name_t *name, dns_name_t *fname,
 		     isc_stdtime_t now, unsigned int options,
-		     isc_boolean_t use_hints, 
+		     isc_boolean_t use_hints,
 		     dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset)
 {
 	return(dns_view_findzonecut2(view, name, fname, now, options,
@@ -1158,8 +1158,8 @@ dns_viewlist_findzone(dns_viewlist_t *list, dns_name_t *name,
 
 	REQUIRE(list != NULL);
 	for (view = ISC_LIST_HEAD(*list);
-             view != NULL;
-             view = ISC_LIST_NEXT(view, link)) {
+	     view != NULL;
+	     view = ISC_LIST_NEXT(view, link)) {
 		if (allclasses == ISC_FALSE && view->rdclass != rdclass)
 			continue;
 		result = dns_zt_find(view->zonetable, name, 0, NULL,
@@ -1390,7 +1390,7 @@ dns_view_isdelegationonly(dns_view_t *view, dns_name_t *name) {
 	return (ISC_TRUE);
 }
 
-void 
+void
 dns_view_setrootdelonly(dns_view_t *view, isc_boolean_t value) {
 	REQUIRE(DNS_VIEW_VALID(view));
 	view->rootdelonly = value;
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index dd1f672c03..a23ccb43e8 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.473 2008/04/01 01:37:25 marka Exp $ */
+/* $Id: zone.c,v 1.474 2008/04/01 23:47:10 tbox Exp $ */
 
 /*! \file */
 
@@ -2036,20 +2036,20 @@ set_signingtime(dns_zone_t *zone) {
 
 	for (result = dns_rdataset_first(&rdataset);
 	     result == ISC_R_SUCCESS;
-	     result = dns_rdataset_next(&rdataset)) 
+	     result = dns_rdataset_next(&rdataset))
 	{
 		dns_rdataset_current(&rdataset, &rdata);
 		if (rdata.length != 4 || rdata.data[3] != 0) {
 			dns_rdata_reset(&rdata);
 			continue;
 		}
-		
-		result = zone_signwithkey(zone, rdata.data[0], 
+
+		result = zone_signwithkey(zone, rdata.data[0],
 					  (rdata.data[1] << 8) | rdata.data[2]);
 		if (result != ISC_R_SUCCESS) {
 			dns_zone_log(zone, ISC_LOG_ERROR,
-			             "dns_zone_signwithkey failed: %s",
-			             dns_result_totext(result));
+				     "dns_zone_signwithkey failed: %s",
+				     dns_result_totext(result));
 		}
 		dns_rdata_reset(&rdata);
 	}
@@ -2060,7 +2060,7 @@ set_signingtime(dns_zone_t *zone) {
 		dns_db_detachnode(zone->db, &node);
 	if (version != NULL)
 		dns_db_closeversion(zone->db, &version, ISC_FALSE);
-	
+
 }
 
 static void
@@ -2261,7 +2261,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 				     "1/4 sig-validity-interval less than "
 				     "3 * refresh.");
 		}
-		 
+
 		zone->serial = serial;
 		zone->refresh = RANGE(refresh,
 				      zone->minrefresh, zone->maxrefresh);
@@ -3199,18 +3199,18 @@ increment_soa_serial(dns_db_t *db, dns_dbversion_t *ver,
 	dns_difftuple_t *addtuple = NULL;
 	isc_uint32_t serial;
 	isc_result_t result;
-		
+
 	CHECK(dns_db_createsoatuple(db, ver, mctx, DNS_DIFFOP_DEL, &deltuple));
 	CHECK(dns_difftuple_copy(deltuple, &addtuple));
 	addtuple->op = DNS_DIFFOP_ADD;
 
 	serial = dns_soa_getserial(&addtuple->rdata);
-				
+
 	/* RFC1982 */
 	serial = (serial + 1) & 0xFFFFFFFF;
 	if (serial == 0)
 		serial = 1;
-			 
+
 	dns_soa_setserial(serial, &addtuple->rdata);
 	CHECK(do_one_tuple(&deltuple, db, ver, diff));
 	CHECK(do_one_tuple(&addtuple, db, ver, diff));
@@ -3286,7 +3286,7 @@ find_zone_keys(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
 	const char *directory = dns_zone_getkeydirectory(zone);
 	CHECK(dns_db_findnode(db, dns_db_origin(db), ISC_FALSE, &node));
 	result = dns_dnssec_findzonekeys2(db, ver, node, dns_db_origin(db),
-				          directory, mctx, maxkeys, keys,
+					  directory, mctx, maxkeys, keys,
 					  nkeys);
 	if (result == ISC_R_NOTFOUND)
 		result = ISC_R_SUCCESS;
@@ -3298,7 +3298,7 @@ find_zone_keys(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
 
 static isc_result_t
 offline(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, dns_name_t *name,
- 	dns_ttl_t ttl, dns_rdata_t *rdata)
+	dns_ttl_t ttl, dns_rdata_t *rdata)
 {
 	isc_result_t result;
 
@@ -3348,7 +3348,7 @@ set_key_expiry_warning(dns_zone_t *zone, isc_stdtime_t when, isc_stdtime_t now)
  * Delete expired RRsigs and any RRsigs we are about to re-sign.
  * See also update.c:del_keysigs().
  */
-static isc_result_t 
+static isc_result_t
 del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
 	 dns_rdatatype_t type, dns_diff_t *diff, dst_key_t **keys,
 	 unsigned int nkeys, isc_stdtime_t now)
@@ -3416,7 +3416,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
 						    maybe > rrsig.timeexpire)
 							maybe =
 							     rrsig.timeexpire;
-						break; 
+						break;
 					}
 					if (warn == 0)
 						warn = maybe;
@@ -3456,7 +3456,7 @@ failure:
 	return (result);
 }
 
-static isc_result_t 
+static isc_result_t
 add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
 	 dns_rdatatype_t type, dns_diff_t *diff, dst_key_t **keys,
 	 unsigned int nkeys, isc_mem_t *mctx, isc_stdtime_t inception,
@@ -3502,7 +3502,7 @@ add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
 				    name, rdataset.ttl, &sig_rdata));
 		dns_rdata_reset(&sig_rdata);
 	}
-	
+
  failure:
 	if (dns_rdataset_isassociated(&rdataset))
 		dns_rdataset_disassociate(&rdataset);
@@ -3533,7 +3533,7 @@ zone_resigninc(dns_zone_t *zone) {
 	dns_rdataset_init(&rdataset);
 	dns_fixedname_init(&fixed);
 	dns_diff_init(zone->mctx, &sig_diff);
-	
+
 	/*
 	 * Updates are disabled.  Pause for 5 minutes.
 	 */
@@ -3616,8 +3616,8 @@ zone_resigninc(dns_zone_t *zone) {
 				  zone_keys, nkeys, now);
 		if (result != ISC_R_SUCCESS) {
 			dns_zone_log(zone, ISC_LOG_ERROR,
-			             "zone_resigninc:del_sigs -> %s\n",
-			             dns_result_totext(result));
+				     "zone_resigninc:del_sigs -> %s\n",
+				     dns_result_totext(result));
 			break;
 		}
 		result = add_sigs(db, version, name, covers, &sig_diff,
@@ -3625,8 +3625,8 @@ zone_resigninc(dns_zone_t *zone) {
 				  expire, check_ksk);
 		if (result != ISC_R_SUCCESS) {
 			dns_zone_log(zone, ISC_LOG_ERROR,
-			             "zone_resigninc:add_sigs -> %s\n",
-			             dns_result_totext(result));
+				     "zone_resigninc:add_sigs -> %s\n",
+				     dns_result_totext(result));
 			break;
 		}
 		result  = dns_db_getsigningtime(db, &rdataset,
@@ -3684,7 +3684,7 @@ zone_resigninc(dns_zone_t *zone) {
 			dns_zone_log(zone, ISC_LOG_ERROR,
 				     "zone_resigninc:dns_journal_open -> %s\n",
 				     dns_result_totext(result));
-			goto failure; 
+			goto failure;
 		}
 
 		result = dns_journal_write_transaction(journal, &sig_diff);
@@ -3768,10 +3768,10 @@ next_active(dns_db_t *db, dns_dbversion_t *version, dns_name_t *oldname,
 
 static void
 set_bit(unsigned char *array, unsigned int index) {
-        unsigned int shift, mask;
+	unsigned int shift, mask;
 
-        shift = 7 - (index % 8);
-        mask = 1 << shift;
+	shift = 7 - (index % 8);
+	mask = 1 << shift;
 
 	array[index / 8] |= mask;
 }
@@ -3784,7 +3784,7 @@ signed_with_key(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 	dns_rdataset_t rdataset;
 	dns_rdata_t rdata = DNS_RDATA_INIT;
 	dns_rdata_rrsig_t rrsig;
-	
+
 	dns_rdataset_init(&rdataset);
 	result = dns_db_findrdataset(db, node, version, dns_rdatatype_rrsig,
 				     type, 0, &rdataset, NULL);
@@ -3986,10 +3986,10 @@ updatesignwithkey(dns_signing_t *signing, dns_dbversion_t *version,
 	unsigned char data[4];
 
 	dns_rdataset_init(&rdataset);
-	result = dns_db_getoriginnode(signing->db, &node); 
+	result = dns_db_getoriginnode(signing->db, &node);
 	if (result != ISC_R_SUCCESS)
 		goto failure;
-	
+
 	result = dns_db_findrdataset(signing->db, node, version, 0xffff,
 				     dns_rdatatype_none, 0, &rdataset, NULL);
 	if (result == ISC_R_NOTFOUND) {
@@ -4245,7 +4245,7 @@ fprintf(stderr, "zone_sign\n");
 				break;
 			} else if (result != ISC_R_SUCCESS) {
 				dns_zone_log(zone, ISC_LOG_ERROR,
-				        "zone_sign:dns_dbiterator_next -> %s\n",
+					"zone_sign:dns_dbiterator_next -> %s\n",
 					     dns_result_totext(result));
 				goto failure;
 			} else if (delegation) {
@@ -4264,13 +4264,13 @@ fprintf(stderr, "zone_sign\n");
 			signing = ISC_LIST_HEAD(zone->signing);
 		}
 	}
-	
+
 	if (secureupdated) {
 		/*
 		 * We have changed the NSEC RRset above so we need to update
 		 * the signatures.
 		 */
-		result = del_sigs(zone, db, version, &zone->origin, 
+		result = del_sigs(zone, db, version, &zone->origin,
 				  dns_rdatatype_nsec, &sig_diff, zone_keys,
 				  nkeys, now);
 		if (result != ISC_R_SUCCESS) {
@@ -4295,7 +4295,7 @@ fprintf(stderr, "zone_sign\n");
 		 * We have changed the RRset above so we need to update
 		 * the signatures.
 		 */
-		result = del_sigs(zone, db, version, &zone->origin, 
+		result = del_sigs(zone, db, version, &zone->origin,
 				  (dns_rdatatype_t)0xffff, &sig_diff,
 				   zone_keys, nkeys, now);
 		if (result != ISC_R_SUCCESS) {
@@ -4355,7 +4355,7 @@ fprintf(stderr, "zone_sign\n");
 			dns_zone_log(zone, ISC_LOG_ERROR,
 				     "zone_sign:dns_journal_open -> %s\n",
 				     dns_result_totext(result));
-			goto failure; 
+			goto failure;
 		}
 
 		result = dns_journal_write_transaction(journal, &sig_diff);
@@ -4414,7 +4414,7 @@ fprintf(stderr, "zone_sign\n");
 		isc_interval_t i;
 		if (zone->update_disabled)
 			isc_interval_set(&i, 60, 0);		/* 1 minute */
-		else 
+		else
 			isc_interval_set(&i, 0, 10000000);	/* 10 ms */
 		isc_interval_set(&i, 120, 0);	   /* XXXMPA */
 		isc_time_nowplusinterval(&zone->signingtime, &i);
@@ -9811,7 +9811,7 @@ zone_signwithkey(dns_zone_t *zone, dns_secalg_t algorithm, uint16_t keyid) {
 		dns_db_attach(zone->db, &signing->db);
 		result = dns_db_createiterator(signing->db, ISC_FALSE,
 					       &signing->dbiterator);
-		
+
 		if (result == ISC_R_SUCCESS)
 			result = dns_dbiterator_first(signing->dbiterator);
 		if (result == ISC_R_SUCCESS) {