diff --git a/bin/named/query.c b/bin/named/query.c
index a375e10354..d62aa70aec 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -251,7 +251,7 @@ query_send(ns_client_t *client) {
 				counter = dns_nsstatscounter_nxrrset;
 		} else
 			counter = dns_nsstatscounter_success;
-	} else if (client->message->rcode == dns_rcode_nxdomain) 
+	} else if (client->message->rcode == dns_rcode_nxdomain)
 		counter = dns_nsstatscounter_nxdomain;
 	else if (client->message->rcode == dns_rcode_badcookie)
 		counter = dns_nsstatscounter_badcookie;
diff --git a/bin/named/server.c b/bin/named/server.c
index 93276724a2..92f119073f 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -6430,7 +6430,7 @@ load_configuration(const char *filename, ns_server_t *server,
 		result = isc_hex_decodestring(cfg_obj_asstring(obj), &b);
 		if (result != ISC_R_SUCCESS && result != ISC_R_NOSPACE)
 			goto cleanup;
-		
+
 		usedlength = isc_buffer_usedlength(&b);
 		switch (server->cookiealg) {
 		case ns_cookiealg_aes:
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 217f4e3228..e8cd028eb7 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1204,7 +1204,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
 		}
 		if (tresult != ISC_R_SUCCESS)
 			result = tresult;
-		
+
 		if (tresult == ISC_R_SUCCESS &&
 		    strcasecmp(ccalg, "aes") != 0 &&
 		    isc_buffer_usedlength(&b) != ISC_AES128_KEYLENGTH) {
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 46e20d278b..0672b6a16f 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -4357,7 +4357,7 @@ dns_adb_probesize2(dns_adb_t *adb, dns_adbaddrinfo_t *addr, int lookups) {
 
 void
 dns_adb_setcookie(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
-	          const unsigned char *cookie, size_t len)
+		  const unsigned char *cookie, size_t len)
 {
 	int bucket;
 
@@ -4388,7 +4388,7 @@ dns_adb_setcookie(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
 
 size_t
 dns_adb_getcookie(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
-	          unsigned char *cookie, size_t len)
+		  unsigned char *cookie, size_t len)
 {
 	int bucket;
 
diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
index 3481bf9e62..0654237d74 100644
--- a/lib/dns/include/dns/types.h
+++ b/lib/dns/include/dns/types.h
@@ -247,7 +247,7 @@ enum {
 	dns_rcode_badvers = 16,
 #define dns_rcode_badvers		((dns_rcode_t)dns_rcode_badvers)
 	/* Private space [3841..4095] */
-	dns_rcode_badcookie = 3860 
+	dns_rcode_badcookie = 3860
 #define dns_rcode_badcookie		((dns_rcode_t)dns_rcode_badcookie)
 };
 
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 648ccb4a1d..74aac47588 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -7311,7 +7311,7 @@ process_opt(resquery_t *query, dns_rdataset_t *opt) {
 						  dns_resstatscounter_cookieok);
 					addrinfo = query->addrinfo;
 					dns_adb_setcookie(query->fctx->adb,
-						          addrinfo, optvalue,
+							  addrinfo, optvalue,
 							  optlen);
 				} else
 					query->fctx->rmessage->cc_bad = 1;
@@ -7722,10 +7722,10 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 					    FCTX_ADDRINFO_NOCOOKIE);
 			resend = ISC_TRUE;
 		} else if ((message->rcode == dns_rcode_formerr ||
-		            message->rcode == dns_rcode_notimp ||
-		            (message->rcode == dns_rcode_servfail &&
-		             dns_message_getopt(message) == NULL)) &&
-		           (query->options & DNS_FETCHOPT_NOEDNS0) == 0) {
+			    message->rcode == dns_rcode_notimp ||
+			    (message->rcode == dns_rcode_servfail &&
+			     dns_message_getopt(message) == NULL)) &&
+			   (query->options & DNS_FETCHOPT_NOEDNS0) == 0) {
 			/*
 			 * It's very likely they don't like EDNS0.
 			 * If the response code is SERVFAIL, also check if the