diff --git a/CHANGES b/CHANGES
index af5230cbf6..7d54c68a43 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4893.	[bug]		Address various issues reported by cppcheck. [GL #51]
+
 	--- 9.12.1rc1 released ---
 
 4889.	[func]		Warn about the use of old root keys without the new
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index ec923acdae..620dde33eb 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -233,7 +233,7 @@ help(void) {
  * Callback from dighost.c to print the received message.
  */
 static void
-received(int bytes, isc_sockaddr_t *from, dig_query_t *query) {
+received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) {
 	isc_uint64_t diff;
 	time_t tnow;
 	struct tm tmnow;
@@ -1311,11 +1311,11 @@ plus_option(const char *option, isc_boolean_t is_batchfile,
 
 			result = parse_uint(&splitwidth, value,
 					    1023, "split");
-			if (splitwidth % 4 != 0) {
+			if ((splitwidth % 4) != 0U) {
 				splitwidth = ((splitwidth + 3) / 4) * 4;
 				fprintf(stderr, ";; Warning, split must be "
 						"a multiple of 4; adjusting "
-						"to %d\n", splitwidth);
+						"to %u\n", splitwidth);
 			}
 			/*
 			 * There is an adjustment done in the
@@ -1884,8 +1884,7 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
 				bargc = 1;
 				input = batchline;
 				bargv[bargc] = next_token(&input, " \t\r\n");
-				while ((bargv[bargc] != NULL) &&
-				       (bargc < 62)) {
+				while ((bargc < 62) && (bargv[bargc] != NULL)) {
 					bargc++;
 					bargv[bargc] =
 						next_token(&input, " \t\r\n");
@@ -2084,7 +2083,7 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
 				goto next_line;
 			input = batchline;
 			bargv[bargc] = next_token(&input, " \t\r\n");
-			while ((bargv[bargc] != NULL) && (bargc < 14)) {
+			while ((bargc < 14) && (bargv[bargc] != NULL)) {
 				bargc++;
 				bargv[bargc] = next_token(&input, " \t\r\n");
 			}
@@ -2154,7 +2153,7 @@ query_finished(void) {
 		bargc = 1;
 		input = batchline;
 		bargv[bargc] = next_token(&input, " \t\r\n");
-		while ((bargv[bargc] != NULL) && (bargc < 14)) {
+		while ((bargc < 14) && (bargv[bargc] != NULL)) {
 			bargc++;
 			bargv[bargc] = next_token(&input, " \t\r\n");
 		}
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index ac2db2a020..e02f301018 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -202,7 +202,7 @@ isc_result_t
 	isc_boolean_t headers);
 
 void
-(*dighost_received)(int bytes, isc_sockaddr_t *from, dig_query_t *query);
+(*dighost_received)(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query);
 
 void
 (*dighost_trying)(char *frm, dig_lookup_t *lookup);
@@ -266,7 +266,7 @@ hex_dump(isc_buffer_t *b) {
 
 	isc_buffer_usedregion(b, &r);
 
-	printf("%d bytes\n", r.length);
+	printf("%u bytes\n", r.length);
 	for (len = 0; len < r.length; len++) {
 		printf("%02x ", r.base[len]);
 		if (len % 16 == 15) {
@@ -437,7 +437,7 @@ debug(const char *format, ...) {
 		fflush(stdout);
 		if (debugtiming) {
 			TIME_NOW(&t);
-			fprintf(stderr, "%d.%06d: ", isc_time_seconds(&t),
+			fprintf(stderr, "%u.%06u: ", isc_time_seconds(&t),
 				isc_time_nanoseconds(&t) / 1000);
 		}
 		va_start(args, format);
@@ -3738,7 +3738,7 @@ recv_done(isc_task_t *task, isc_event_t *event) {
 		 */
 		if (l->comments)
 			printf(";; BADVERS, retrying with EDNS version %u.\n",
-			       newedns);
+			       (unsigned int)newedns);
 		l->edns = newedns;
 		n = requeue_lookup(l, ISC_TRUE);
 		if (l->trace && l->trace_root)
diff --git a/bin/dig/host.c b/bin/dig/host.c
index 13800472e1..950f9a1e56 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -169,7 +169,7 @@ host_shutdown(void) {
 }
 
 static void
-received(int bytes, isc_sockaddr_t *from, dig_query_t *query) {
+received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) {
 	isc_time_t now;
 	int diff;
 
diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index 748a0a5ead..c132efd5d9 100644
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -382,7 +382,7 @@ extern isc_result_t
  */
 
 extern void
-(*dighost_received)(int bytes, isc_sockaddr_t *from, dig_query_t *query);
+(*dighost_received)(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query);
 /*%<
  * Print a message about where and when the response
  * was received from, like the final comment in the
diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index 131c9d6b4f..66232bf06a 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -387,7 +387,7 @@ detailsection(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers,
 }
 
 static void
-received(int bytes, isc_sockaddr_t *from, dig_query_t *query)
+received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query)
 {
 	UNUSED(bytes);
 	UNUSED(from);
@@ -549,7 +549,7 @@ show_settings(isc_boolean_t full, isc_boolean_t serv_only) {
 	printf("  %s\t\t%s\n",
 	       usesearch ? "search" : "nosearch",
 	       recurse ? "recurse" : "norecurse");
-	printf("  timeout = %d\t\tretry = %d\tport = %d\tndots = %d\n",
+	printf("  timeout = %u\t\tretry = %d\tport = %u\tndots = %d\n",
 	       timeout, tries, port, ndots);
 	printf("  querytype = %-8s\tclass = %s\n", deftype, defclass);
 	printf("  srchlist = ");
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index ea70f181dd..92025c1642 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1999-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -2513,11 +2513,11 @@ loadzonekeys(isc_boolean_t preserve_keys, isc_boolean_t load_public) {
 		goto cleanup;
 
 	if (set_keyttl && keyttl != rdataset.ttl) {
-		fprintf(stderr, "User-specified TTL %d conflicts "
+		fprintf(stderr, "User-specified TTL %u conflicts "
 				"with existing DNSKEY RRset TTL.\n",
 				keyttl);
 		fprintf(stderr, "Imported keys will use the RRSet "
-				"TTL %d instead.\n",
+				"TTL %u instead.\n",
 				rdataset.ttl);
 	}
 	keyttl = rdataset.ttl;
@@ -3128,12 +3128,12 @@ print_stats(isc_time_t *timer_start, isc_time_t *timer_finish,
 	isc_uint64_t sig_ms;	   /* Signatures per millisecond */
 	FILE *out = output_stdout ? stderr : stdout;
 
-	fprintf(out, "Signatures generated:               %10d\n", nsigned);
-	fprintf(out, "Signatures retained:                %10d\n", nretained);
-	fprintf(out, "Signatures dropped:                 %10d\n", ndropped);
-	fprintf(out, "Signatures successfully verified:   %10d\n", nverified);
+	fprintf(out, "Signatures generated:               %10u\n", nsigned);
+	fprintf(out, "Signatures retained:                %10u\n", nretained);
+	fprintf(out, "Signatures dropped:                 %10u\n", ndropped);
+	fprintf(out, "Signatures successfully verified:   %10u\n", nverified);
 	fprintf(out, "Signatures unsuccessfully "
-		     "verified: %10d\n", nverifyfailed);
+		     "verified: %10u\n", nverifyfailed);
 
 	time_us = isc_time_microdiff(sign_finish, sign_start);
 	time_ms = time_us / 1000;
@@ -3646,8 +3646,8 @@ main(int argc, char *argv[]) {
 	get_soa_ttls();
 
 	if (set_maxttl && set_keyttl && keyttl > maxttl) {
-		fprintf(stderr, "%s: warning: Specified key TTL %d "
-			"exceeds maximum zone TTL; reducing to %d\n",
+		fprintf(stderr, "%s: warning: Specified key TTL %u "
+			"exceeds maximum zone TTL; reducing to %u\n",
 			program, keyttl, maxttl);
 		keyttl = maxttl;
 	}
diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
index 280e6de69a..b79e1c03a2 100644
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -209,12 +209,14 @@ cleanup_logging(isc_log_t **logp) {
 	REQUIRE(logp != NULL);
 
 	log = *logp;
+	*logp = NULL;
+
 	if (log == NULL)
 		return;
+
 	isc_log_destroy(&log);
 	isc_log_setcontext(NULL);
 	dns_log_setcontext(NULL);
-	logp = NULL;
 }
 
 void
diff --git a/bin/named/server.c b/bin/named/server.c
index ae084762c2..e4aefcc102 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -10825,7 +10825,7 @@ named_server_setdebuglevel(named_server_t *server, isc_lex_t *lex) {
 	isc_log_setdebuglevel(named_g_lctx, named_g_debuglevel);
 	isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
 		      NAMED_LOGMODULE_SERVER, ISC_LOG_INFO,
-		      "debug level is now %d", named_g_debuglevel);
+		      "debug level is now %u", named_g_debuglevel);
 	return (ISC_R_SUCCESS);
 }
 
@@ -11214,7 +11214,7 @@ named_server_status(named_server_t *server, isc_buffer_t **text) {
 		     zonecount, automatic);
 	CHECK(putstr(text, line));
 
-	snprintf(line, sizeof(line), "debug level: %d\n", named_g_debuglevel);
+	snprintf(line, sizeof(line), "debug level: %u\n", named_g_debuglevel);
 	CHECK(putstr(text, line));
 
 	snprintf(line, sizeof(line), "xfers running: %u\n", xferrunning);
@@ -11381,7 +11381,7 @@ named_server_tsigdelete(named_server_t *server, isc_lex_t *lex,
 	}
 	isc_task_endexclusive(server->task);
 
-	snprintf(fbuf, sizeof(fbuf), "%d", foundkeys);
+	snprintf(fbuf, sizeof(fbuf), "%u", foundkeys);
 
 	CHECK(putstr(text, fbuf));
 	CHECK(putstr(text, " tsig keys deleted."));
@@ -14811,9 +14811,11 @@ named_server_dnstap(named_server_t *server, isc_lex_t *lex,
 		unsigned int n;
 		ptr = next_token(lex, text);
 		if (ptr != NULL) {
-			n = sscanf(ptr, "%u", &backups);
-			if (n != 1U)
+			unsigned int u;
+			n = sscanf(ptr, "%u", &u);
+			if (n != 1U || u > INT_MAX)
 				return (ISC_R_BADNUMBER);
+			backups = u;
 		} else {
 			backups = ISC_LOG_ROLLINFINITE;
 		}
diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index f6e6da30b2..cfabc3a0c1 100644
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2002, 2004-2011, 2013-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2002, 2004-2011, 2013-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -755,7 +755,9 @@ mkdirpath(char *filename, void (*report)(const char *, ...)) {
 
 static void
 setperms(uid_t uid, gid_t gid) {
+#if defined(HAVE_SETEGID) || defined(HAVE_SETRESGID)
 	char strbuf[ISC_STRERRORSIZE];
+#endif
 #if !defined(HAVE_SETEGID) && defined(HAVE_SETRESGID)
 	gid_t oldgid, tmpg;
 #endif
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index ab28176b8a..4d14f2d79a 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -1685,6 +1685,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
 							     ipkl.addrs,
 							     ipkl.keys,
 							     ipkl.count);
+			count = ipkl.count;
 			dns_ipkeylist_clear(mctx, &ipkl);
 			RETERR(result);
 		} else
diff --git a/bin/pkcs11/pkcs11-destroy.c b/bin/pkcs11/pkcs11-destroy.c
index 0f31a78a58..81f4db2cdb 100644
--- a/bin/pkcs11/pkcs11-destroy.c
+++ b/bin/pkcs11/pkcs11-destroy.c
@@ -232,7 +232,7 @@ main(int argc, char *argv[]) {
 
 	if (wait != 0) {
 		printf("WARNING: This action is irreversible! "
-		       "Destroying key objects in %d seconds\n  ", wait);
+		       "Destroying key objects in %u seconds\n  ", wait);
 		for (i = 0; i < wait; i++) {
 			printf(".");
 			fflush(stdout);
diff --git a/bin/pkcs11/pkcs11-list.c b/bin/pkcs11/pkcs11-list.c
index c79ee9ace6..05d24d9dee 100644
--- a/bin/pkcs11/pkcs11-list.c
+++ b/bin/pkcs11/pkcs11-list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -125,7 +125,7 @@ main(int argc, char *argv[]) {
 		printf("slot %lu\n", slot);
 
 	if (id) {
-		printf("id %i\n", id);
+		printf("id %u\n", id);
 		attr_id[0] = (id >> 8) & 0xff;
 		attr_id[1] = id & 0xff;
 	} else if (label != NULL) {
diff --git a/bin/tests/dst/dst_test.c b/bin/tests/dst/dst_test.c
index 879746a023..d499e986a5 100644
--- a/bin/tests/dst/dst_test.c
+++ b/bin/tests/dst/dst_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2009, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2001, 2004, 2005, 2007, 2009, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -54,19 +54,19 @@ use(dst_key_t *key, isc_mem_t *mctx) {
 	ret = dst_context_create3(key, mctx,
 				  DNS_LOGCATEGORY_GENERAL, ISC_TRUE, &ctx);
 	if (ret != ISC_R_SUCCESS) {
-		printf("contextcreate(%d) returned: %s\n", dst_key_alg(key),
+		printf("contextcreate(%u) returned: %s\n", dst_key_alg(key),
 		       isc_result_totext(ret));
 		return;
 	}
 	ret = dst_context_adddata(ctx, &datareg);
 	if (ret != ISC_R_SUCCESS) {
-		printf("adddata(%d) returned: %s\n", dst_key_alg(key),
+		printf("adddata(%u) returned: %s\n", dst_key_alg(key),
 		       isc_result_totext(ret));
 		dst_context_destroy(&ctx);
 		return;
 	}
 	ret = dst_context_sign(ctx, &sigbuf);
-	printf("sign(%d) returned: %s\n", dst_key_alg(key),
+	printf("sign(%u) returned: %s\n", dst_key_alg(key),
 	       isc_result_totext(ret));
 	dst_context_destroy(&ctx);
 
@@ -75,19 +75,19 @@ use(dst_key_t *key, isc_mem_t *mctx) {
 	ret = dst_context_create3(key, mctx,
 				  DNS_LOGCATEGORY_GENERAL, ISC_FALSE, &ctx);
 	if (ret != ISC_R_SUCCESS) {
-		printf("contextcreate(%d) returned: %s\n", dst_key_alg(key),
+		printf("contextcreate(%u) returned: %s\n", dst_key_alg(key),
 		       isc_result_totext(ret));
 		return;
 	}
 	ret = dst_context_adddata(ctx, &datareg);
 	if (ret != ISC_R_SUCCESS) {
-		printf("adddata(%d) returned: %s\n", dst_key_alg(key),
+		printf("adddata(%u) returned: %s\n", dst_key_alg(key),
 		       isc_result_totext(ret));
 		dst_context_destroy(&ctx);
 		return;
 	}
 	ret = dst_context_verify(ctx, &sigreg);
-	printf("verify(%d) returned: %s\n", dst_key_alg(key),
+	printf("verify(%u) returned: %s\n", dst_key_alg(key),
 	       isc_result_totext(ret));
 	dst_context_destroy(&ctx);
 }
@@ -104,19 +104,19 @@ dns(dst_key_t *key, isc_mem_t *mctx) {
 
 	isc_buffer_init(&buf1, buffer1, sizeof(buffer1));
 	ret = dst_key_todns(key, &buf1);
-	printf("todns(%d) returned: %s\n", dst_key_alg(key),
+	printf("todns(%u) returned: %s\n", dst_key_alg(key),
 	       isc_result_totext(ret));
 	if (ret != ISC_R_SUCCESS)
 		return;
 	ret = dst_key_fromdns(dst_key_name(key), dns_rdataclass_in,
 			      &buf1, mctx, &newkey);
-	printf("fromdns(%d) returned: %s\n", dst_key_alg(key),
+	printf("fromdns(%u) returned: %s\n", dst_key_alg(key),
 	       isc_result_totext(ret));
 	if (ret != ISC_R_SUCCESS)
 		return;
 	isc_buffer_init(&buf2, buffer2, sizeof(buffer2));
 	ret = dst_key_todns(newkey, &buf2);
-	printf("todns2(%d) returned: %s\n", dst_key_alg(key),
+	printf("todns2(%u) returned: %s\n", dst_key_alg(key),
 	       isc_result_totext(ret));
 	if (ret != ISC_R_SUCCESS)
 		return;
@@ -124,7 +124,7 @@ dns(dst_key_t *key, isc_mem_t *mctx) {
 	isc_buffer_usedregion(&buf2, &r2);
 	match = ISC_TF(r1.length == r2.length &&
 		       memcmp(r1.base, r2.base, r1.length) == 0);
-	printf("compare(%d): %s\n", dst_key_alg(key),
+	printf("compare(%u): %s\n", dst_key_alg(key),
 	       match ? "true" : "false");
 	dst_key_free(&newkey);
 }
@@ -194,11 +194,11 @@ dh(dns_name_t *name1, int id1, dns_name_t *name2, int id2, isc_mem_t *mctx) {
 	{
 		int i;
 		printf("secrets don't match\n");
-		printf("secret 1: %d bytes\n", r1.length);
+		printf("secret 1: %u bytes\n", r1.length);
 		for (i = 0; i < (int) r1.length; i++)
 			printf("%02x ", r1.base[i]);
 		printf("\n");
-		printf("secret 2: %d bytes\n", r2.length);
+		printf("secret 2: %u bytes\n", r2.length);
 		for (i = 0; i < (int) r2.length; i++)
 			printf("%02x ", r2.base[i]);
 		printf("\n");
diff --git a/bin/tests/entropy2_test.c b/bin/tests/entropy2_test.c
index 0330aef18e..1545506cd1 100644
--- a/bin/tests/entropy2_test.c
+++ b/bin/tests/entropy2_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -31,7 +31,7 @@ hex_dump(const char *msg, void *data, unsigned int length) {
 
 	base = data;
 
-	printf("DUMP of %d bytes:  %s\n\t", length, msg);
+	printf("DUMP of %u bytes:  %s\n\t", length, msg);
 	for (len = 0; len < length; len++) {
 		if (len % 16 == 0 && !first)
 			printf("\n\t");
diff --git a/bin/tests/entropy_test.c b/bin/tests/entropy_test.c
index 38e285c971..d89a38c423 100644
--- a/bin/tests/entropy_test.c
+++ b/bin/tests/entropy_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -29,7 +29,7 @@ hex_dump(const char *msg, void *data, unsigned int length) {
 
 	base = data;
 
-	printf("DUMP of %d bytes:  %s\n\t", length, msg);
+	printf("DUMP of %u bytes:  %s\n\t", length, msg);
 	for (len = 0; len < length; len++) {
 		if (len % 16 == 0 && !first)
 			printf("\n\t");
diff --git a/bin/tests/fsaccess_test.c b/bin/tests/fsaccess_test.c
index 88035098e8..460f2a58cf 100644
--- a/bin/tests/fsaccess_test.c
+++ b/bin/tests/fsaccess_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2012, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -54,11 +54,11 @@ main(void) {
 			 ISC_FSACCESS_READ | ISC_FSACCESS_WRITE,
 			 &access);
 
-	printf("fsaccess=%d\n", access);
+	printf("fsaccess=%u\n", access);
 
 	isc_fsaccess_add(ISC_FSACCESS_OTHER, ISC_FSACCESS_READ, &access);
 
-	printf("fsaccess=%d\n", access);
+	printf("fsaccess=%u\n", access);
 
 	result = isc_fsaccess_set(PATH, access);
 	if (result != ISC_R_SUCCESS)
diff --git a/bin/tests/inter_test.c b/bin/tests/inter_test.c
index 3c26ba3d0a..3caa2d2fe4 100644
--- a/bin/tests/inter_test.c
+++ b/bin/tests/inter_test.c
@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2000, 2001, 2003-2005, 2007, 2008, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2003-2005, 2007, 2008, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: inter_test.c,v 1.16 2008/03/20 23:47:00 tbox Exp $ */
-
 /*! \file */
 #include <config.h>
 
@@ -42,7 +40,7 @@ main(int argc, char **argv) {
 				isc_result_totext(result));
 			continue;
 		}
-		fprintf(stdout, "%s %d %x\n", ifdata.name, ifdata.af,
+		fprintf(stdout, "%s %u %x\n", ifdata.name, ifdata.af,
 			ifdata.flags);
 		INSIST(ifdata.af == AF_INET || ifdata.af == AF_INET6);
 		res = inet_ntop(ifdata.af, &ifdata.address.type, buf,
@@ -89,7 +87,7 @@ main(int argc, char **argv) {
 				isc_result_totext(result));
 			continue;
 		}
-		fprintf(stdout, "%s %d %x\n", ifdata.name, ifdata.af,
+		fprintf(stdout, "%s %u %x\n", ifdata.name, ifdata.af,
 			ifdata.flags);
 		INSIST(ifdata.af == AF_INET || ifdata.af == AF_INET6);
 		res = inet_ntop(ifdata.af, &ifdata.address.type, buf,
diff --git a/bin/tests/mem/t_mem.c b/bin/tests/mem/t_mem.c
index e4b2fd90bf..c55d7ea2f9 100644
--- a/bin/tests/mem/t_mem.c
+++ b/bin/tests/mem/t_mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007, 2009, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2001, 2004, 2007, 2009, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -170,7 +170,7 @@ memtest(void) {
 
 	isc_mem_destroy(&mctx);
 
-	return(0);
+	return(nfails);
 }
 
 static const char *a1 =
diff --git a/bin/tests/name_test.c b/bin/tests/name_test.c
index 1a154fe496..57081c19c1 100644
--- a/bin/tests/name_test.c
+++ b/bin/tests/name_test.c
@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 1998-2001, 2003-2005, 2007, 2009, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2003-2005, 2007, 2009, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: name_test.c,v 1.43 2009/09/02 23:48:01 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
@@ -123,8 +121,8 @@ main(int argc, char *argv[]) {
 						   dns_rootname, 0, NULL);
 			if (result != 0) {
 				fprintf(stderr,
-					"dns_name_fromtext() failed: %d\n",
-					result);
+					"dns_name_fromtext() failed: %s\n",
+					dns_result_totext(result));
 				exit(1);
 			}
 			origin = &oname.name;
@@ -147,8 +145,8 @@ main(int argc, char *argv[]) {
 						   0, NULL);
 			if (result != 0) {
 				fprintf(stderr,
-					"dns_name_fromtext() failed: %d\n",
-					result);
+					"dns_name_fromtext() failed: %s\n",
+					dns_result_totext(result));
 				exit(1);
 			}
 		}
diff --git a/bin/tests/rbt/t_rbt.c b/bin/tests/rbt/t_rbt.c
index f05da74b3a..5acae8173d 100644
--- a/bin/tests/rbt/t_rbt.c
+++ b/bin/tests/rbt/t_rbt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2001, 2003-2005, 2007, 2009, 2011-2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2003-2005, 2007, 2009, 2011-2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -33,9 +33,9 @@ char		*Tokens[T_MAXTOKS];
 
 static int
 t_dns_rbtnodechain_init(char *dbfile, char *findname,
-			char *firstname, char *firstorigin,
 			char *nextname, char *nextorigin,
 			char *prevname, char *prevorigin,
+			char *firstname, char *firstorigin,
 			char *lastname, char *lastorigin);
 static char *
 fixedname_totext(dns_fixedname_t *name);
diff --git a/bin/tests/rbt_test.c b/bin/tests/rbt_test.c
index c0586fc12c..f536c9fe47 100644
--- a/bin/tests/rbt_test.c
+++ b/bin/tests/rbt_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2005, 2007, 2009, 2011, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2001, 2004, 2005, 2007, 2009, 2011, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -177,7 +177,7 @@ detail(dns_rbt_t *rbt, dns_name_t *name) {
 		printf("\n  result from dns_rbtnodechain_current: %s\n",
 		       dns_result_totext(result));
 
-	printf("  level_matches = %d, level_count = %d\n",
+	printf("  level_matches = %u, level_count = %u\n",
 	       chain.level_matches, chain.level_count);
 }
 
diff --git a/bin/tests/rwlock_test.c b/bin/tests/rwlock_test.c
index 5a542312e3..8cf7c708ea 100644
--- a/bin/tests/rwlock_test.c
+++ b/bin/tests/rwlock_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2004, 2005, 2007, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -104,7 +104,7 @@ main(int argc, char *argv[]) {
 		nworkers = 2;
 	if (nworkers > 100)
 		nworkers = 100;
-	printf("%d workers\n", nworkers);
+	printf("%u workers\n", nworkers);
 
 	RUNTIME_CHECK(isc_rwlock_init(&lock, 5, 10) == ISC_R_SUCCESS);
 
diff --git a/bin/tests/shutdown_test.c b/bin/tests/shutdown_test.c
index 11f6aacc6e..923aac0230 100644
--- a/bin/tests/shutdown_test.c
+++ b/bin/tests/shutdown_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2011, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2004, 2007, 2011, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -139,7 +139,7 @@ new_task(isc_mem_t *mctx, const char *name) {
 		INSIST(strlen(name) < sizeof(ti->name));
 		strlcpy(ti->name, name, sizeof(ti->name));
 	} else {
-		snprintf(ti->name, sizeof(ti->name), "%d", task_count);
+		snprintf(ti->name, sizeof(ti->name), "%u", task_count);
 	}
 	RUNTIME_CHECK(isc_task_create(task_manager, 0, &ti->task) ==
 		      ISC_R_SUCCESS);
@@ -175,7 +175,7 @@ main(int argc, char *argv[]) {
 			workers = 8192;
 	} else
 		workers = 2;
-	printf("%d workers\n", workers);
+	printf("%u workers\n", workers);
 
 	mctx = NULL;
 	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
diff --git a/bin/tests/sock_test.c b/bin/tests/sock_test.c
index 8463414c1c..1846eb2139 100644
--- a/bin/tests/sock_test.c
+++ b/bin/tests/sock_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2008, 2012-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2004, 2007, 2008, 2012-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -42,8 +42,8 @@ my_send(isc_task_t *task, isc_event_t *event) {
 	sock = event->ev_sender;
 	dev = (isc_socketevent_t *)event;
 
-	printf("my_send: %s task %p\n\t(sock %p, base %p, length %d, n %d, "
-	       "result %d)\n",
+	printf("my_send: %s task %p\n\t(sock %p, base %p, length %u, n %u, "
+	       "result %u)\n",
 	       (char *)(event->ev_arg), task, sock,
 	       dev->region.base, dev->region.length,
 	       dev->n, dev->result);
@@ -70,7 +70,7 @@ my_recv(isc_task_t *task, isc_event_t *event) {
 	sock = event->ev_sender;
 	dev = (isc_socketevent_t *)event;
 
-	printf("Socket %s (sock %p, base %p, length %d, n %d, result %d)\n",
+	printf("Socket %s (sock %p, base %p, length %u, n %u, result %u)\n",
 	       (char *)(event->ev_arg), sock,
 	       dev->region.base, dev->region.length,
 	       dev->n, dev->result);
@@ -130,8 +130,8 @@ my_http_get(isc_task_t *task, isc_event_t *event) {
 	sock = event->ev_sender;
 	dev = (isc_socketevent_t *)event;
 
-	printf("my_http_get: %s task %p\n\t(sock %p, base %p, length %d, "
-	       "n %d, result %d)\n",
+	printf("my_http_get: %s task %p\n\t(sock %p, base %p, length %u, "
+	       "n %u, result %u)\n",
 	       (char *)(event->ev_arg), task, sock,
 	       dev->region.base, dev->region.length,
 	       dev->n, dev->result);
@@ -160,7 +160,7 @@ my_connect(isc_task_t *task, isc_event_t *event) {
 	sock = event->ev_sender;
 	dev = (isc_socket_connev_t *)event;
 
-	printf("%s: Connection result:  %d\n", (char *)(event->ev_arg),
+	printf("%s: Connection result:  %u\n", (char *)(event->ev_arg),
 	       dev->result);
 
 	if (dev->result != ISC_R_SUCCESS) {
@@ -200,7 +200,7 @@ my_listen(isc_task_t *task, isc_event_t *event) {
 
 	dev = (isc_socket_newconnev_t *)event;
 
-	printf("newcon %s (task %p, oldsock %p, newsock %p, result %d)\n",
+	printf("newcon %s (task %p, oldsock %p, newsock %p, result %u)\n",
 	       name, task, event->ev_sender, dev->newsocket, dev->result);
 	fflush(stdout);
 
@@ -279,7 +279,7 @@ main(int argc, char *argv[]) {
 			workers = 8192;
 	} else
 		workers = 2;
-	printf("%d workers\n", workers);
+	printf("%u workers\n", workers);
 
 	if (isc_net_probeipv6() == ISC_R_SUCCESS)
 		pf = PF_INET6;
diff --git a/bin/tests/system/rpz/dnsrps.c b/bin/tests/system/rpz/dnsrps.c
index 6e26106032..373c19fe9b 100644
--- a/bin/tests/system/rpz/dnsrps.c
+++ b/bin/tests/system/rpz/dnsrps.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -125,7 +125,7 @@ main(int argc, char **argv) {
 			}
 			librpz->rsp_detach(&rsp);
 			librpz->client_detach(&client);
-			printf("%d\n", serial);
+			printf("%u\n", serial);
 			return (0);
 #else
 			INSIST(0);
diff --git a/bin/tests/task_test.c b/bin/tests/task_test.c
index bcbfde364d..dd60feb3b7 100644
--- a/bin/tests/task_test.c
+++ b/bin/tests/task_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2004, 2007, 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -76,7 +76,7 @@ main(int argc, char *argv[]) {
 			workers = 8192;
 	} else
 		workers = 2;
-	printf("%d workers\n", workers);
+	printf("%u workers\n", workers);
 
 	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
 
diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c
index 79831db5b1..adebd3a9d9 100644
--- a/bin/tests/tasks/t_tasks.c
+++ b/bin/tests/tasks/t_tasks.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2009, 2011, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2004, 2005, 2007, 2009, 2011, 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -489,7 +489,6 @@ t_tasks2(void) {
 	uintptr_t		ntasks;
 	int			result;
 	char			*p;
-	isc_event_t		*event;
 	unsigned int		workers;
 	isc_result_t		isc_result;
 
@@ -546,7 +545,7 @@ t_tasks2(void) {
 	}
 
 	T2_event = isc_event_allocate(T2_mctx, (void *)1, 1, t2_callback,
-					(void *)ntasks, sizeof(*event));
+				      (void *)ntasks, sizeof(*T2_event));
 	if (T2_event == NULL) {
 		t_info("isc_event_allocate failed\n");
 		return(T_UNRESOLVED);
@@ -1367,7 +1366,7 @@ t10_event2(isc_task_t *task, isc_event_t *event) {
 		       event->ev_sender,
 		       (int)event->ev_type,
 		       event->ev_tag,
-		       event->ev_attributes & ISC_EVENTATTR_NOPURGE ?
+		       ((event->ev_attributes & ISC_EVENTATTR_NOPURGE) != 0) ?
 		       "NP" : "P");
 	}
 
@@ -1393,7 +1392,7 @@ t10_event2(isc_task_t *task, isc_event_t *event) {
 	if (sender_match && type_match && tag_match) {
 		if (event->ev_attributes & ISC_EVENTATTR_NOPURGE) {
 			t_info("event %p,%d,%p matched but was not purgable\n",
-				event->ev_sender, (int)event->ev_type,
+			       event->ev_sender, (int)event->ev_type,
 			       event->ev_tag);
 			++T10_eventcnt;
 		} else {
diff --git a/bin/tests/timer_test.c b/bin/tests/timer_test.c
index 790ce40574..5f6015bdcb 100644
--- a/bin/tests/timer_test.c
+++ b/bin/tests/timer_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2001, 2004, 2007, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2004, 2007, 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -106,7 +106,7 @@ main(int argc, char *argv[]) {
 			workers = 8192;
 	} else
 		workers = 2;
-	printf("%d workers\n", workers);
+	printf("%u workers\n", workers);
 
 	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx1) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_taskmgr_create(mctx1, workers, 0, &manager) ==
diff --git a/bin/tools/dnstap-read.c b/bin/tools/dnstap-read.c
index c9d30ab7df..756b22b38b 100644
--- a/bin/tools/dnstap-read.c
+++ b/bin/tools/dnstap-read.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -223,7 +223,7 @@ print_yaml(dns_dtdata_t *dt) {
 	}
 
 	if (dt->msgdata.base != NULL) {
-		printf("  message_size: %zdb\n", (size_t) dt->msgdata.length);
+		printf("  message_size: %zub\n", (size_t) dt->msgdata.length);
 	} else
 		printf("  message_size: 0b\n");
 
diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index 5c81527771..e685a884b5 100644
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1378,12 +1378,12 @@ plus_option(char *option, struct query *query, isc_boolean_t global)
 
 			result = parse_uint(&display_splitwidth, value,
 					    1023, "split");
-			if (display_splitwidth % 4 != 0) {
+			if ((display_splitwidth % 4) != 0) {
 				display_splitwidth =
 				    ((display_splitwidth + 3) / 4) * 4;
 				fprintf(stderr, ";; Warning, split must be "
 						"a multiple of 4; adjusting "
-						"to %d\n",
+						"to %u\n",
 					display_splitwidth);
 			}
 			/*
@@ -1872,7 +1872,7 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv)
 				continue;
 			input = batchline;
 			bargv[bargc] = next_token(&input, " \t\r\n");
-			while ((bargv[bargc] != NULL) && (bargc < 14)) {
+			while ((bargc < 14) && (bargv[bargc] != NULL)) {
 				bargc++;
 				bargv[bargc] = next_token(&input, " \t\r\n");
 			}
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 9af022e7ff..b30f695139 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -3436,7 +3436,7 @@ static void
 dump_ttl(FILE *f, const char *legend, isc_stdtime_t value, isc_stdtime_t now) {
 	if (value == INT_MAX)
 		return;
-	fprintf(f, " [%s TTL %d]", legend, value - now);
+	fprintf(f, " [%s TTL %d]", legend, (int)(value - now));
 }
 
 static void
@@ -3467,7 +3467,7 @@ dump_adb(dns_adb_t *adb, FILE *f, isc_boolean_t debug, isc_stdtime_t now) {
 		if (name == NULL)
 			continue;
 		if (debug)
-			fprintf(f, "; bucket %d\n", i);
+			fprintf(f, "; bucket %u\n", i);
 		for (;
 		     name != NULL;
 		     name = ISC_LIST_NEXT(name, plink))
@@ -3554,7 +3554,7 @@ dump_entry(FILE *f, dns_adb_t *adb, dns_adbentry_t *entry,
 		fprintf(f, "]");
 	}
 	if (entry->expires != 0)
-		fprintf(f, " [ttl %d]", entry->expires - now);
+		fprintf(f, " [ttl %d]", (int)(entry->expires - now));
 
 	if (adb != NULL && adb->quota != 0 && adb->atr_freq != 0) {
 		fprintf(f, " [atr %0.2f] [quota %u]",
@@ -3570,7 +3570,7 @@ dump_entry(FILE *f, dns_adb_t *adb, dns_adbentry_t *entry,
 		print_dns_name(f, &li->qname);
 		dns_rdatatype_format(li->qtype, typebuf, sizeof(typebuf));
 		fprintf(f, " %s [lame TTL %d]\n", typebuf,
-			li->lame_timer - now);
+			(int)(li->lame_timer - now));
 	}
 }
 
diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c
index 19253e7b28..22ba897d3f 100644
--- a/lib/dns/byaddr.c
+++ b/lib/dns/byaddr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2005, 2007, 2009, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2005, 2007, 2009, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -75,10 +75,10 @@ dns_byaddr_createptrname2(const isc_netaddr_t *address, unsigned int options,
 	if (address->family == AF_INET) {
 		(void)snprintf(textname, sizeof(textname),
 			       "%u.%u.%u.%u.in-addr.arpa.",
-			       (bytes[3] & 0xff),
-			       (bytes[2] & 0xff),
-			       (bytes[1] & 0xff),
-			       (bytes[0] & 0xff));
+			       (bytes[3] & 0xffU),
+			       (bytes[2] & 0xffU),
+			       (bytes[1] & 0xffU),
+			       (bytes[0] & 0xffU));
 	} else if (address->family == AF_INET6) {
 		size_t remaining;
 
diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index 4d771bebb2..5019ffa5bb 100644
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -1545,9 +1545,9 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
 	 * use the DSCP value set for the first master
 	 */
 	if (entry->opts.masters.count > 0 &&
-	    entry->opts.masters.dscps[0] != -1) {
+	    entry->opts.masters.dscps[0] >= 0) {
 		isc_buffer_putstr(buffer, " dscp ");
-		snprintf(pbuf, sizeof(pbuf), "%u",
+		snprintf(pbuf, sizeof(pbuf), "%d",
 			 entry->opts.masters.dscps[0]);
 		isc_buffer_putstr(buffer, pbuf);
 	}
diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c
index 9c58a79ee8..9022762544 100644
--- a/lib/dns/dnstap.c
+++ b/lib/dns/dnstap.c
@@ -1247,7 +1247,7 @@ dns_dt_datatotext(dns_dtdata_t *d, isc_buffer_t **dest) {
 
 	/* Message size */
 	if (d->msgdata.base != NULL) {
-		snprintf(buf, sizeof(buf), "%zdb ", (size_t) d->msgdata.length);
+		snprintf(buf, sizeof(buf), "%zub ", (size_t) d->msgdata.length);
 		CHECK(putstr(dest, buf));
 	} else
 		CHECK(putstr(dest, "0b "));
diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index 9e7aef685d..2e1d695382 100644
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1999-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1823,7 +1823,7 @@ write_public_key(const dst_key_t *key, int type, const char *directory) {
 	fprintf(fp, " ");
 
 	if (key->key_ttl != 0)
-		fprintf(fp, "%d ", key->key_ttl);
+		fprintf(fp, "%u ", key->key_ttl);
 
 	isc_buffer_usedregion(&classb, &r);
 	if ((unsigned) fwrite(r.base, 1, r.length, fp) != r.length)
diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c
index c984c4ca57..5b64142de5 100644
--- a/lib/dns/dst_parse.c
+++ b/lib/dns/dst_parse.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2002, 2004-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1999-2002, 2004-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -738,7 +738,7 @@ dst__privstruct_writefile(const dst_key_t *key, const dst_private_t *priv,
 	/* XXXDCL return value should be checked for full filesystem */
 	fprintf(fp, "%s v%d.%d\n", PRIVATE_KEY_STR, major, minor);
 
-	fprintf(fp, "%s %d ", ALGORITHM_STR, dst_key_alg(key));
+	fprintf(fp, "%s %u ", ALGORITHM_STR, dst_key_alg(key));
 
 	/* XXXVIX this switch statement is too sparse to gen a jump table. */
 	switch (dst_key_alg(key)) {
diff --git a/lib/dns/geoip.c b/lib/dns/geoip.c
index c27042c604..6abe9cfdb8 100644
--- a/lib/dns/geoip.c
+++ b/lib/dns/geoip.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -189,10 +189,12 @@ set_state(unsigned int family, isc_uint32_t ipnum, const geoipv6_t *ipnum6,
 	clean_state(state);
 #endif
 
-	if (family == AF_INET)
+	if (family == AF_INET) {
 		state->ipnum = ipnum;
-	else
+	} else {
+		INSIST(ipnum6 != NULL);
 		state->ipnum6 = *ipnum6;
+	}
 
 	state->family = family;
 	state->subtype = subtype;
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 664ef6eed5..70b0537bef 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2009, 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2009, 2011-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1566,7 +1566,7 @@ writeheader(dns_dumpctx_t *dctx) {
 		 */
 		if (dctx->do_date) {
 			fprintf(dctx->f,
-				"; using a %d second stale ttl\n",
+				"; using a %u second stale ttl\n",
 				dctx->tctx.serve_stale_ttl);
 			result = dns_time32_totext(dctx->now, &buffer);
 			RUNTIME_CHECK(result == ISC_R_SUCCESS);
diff --git a/lib/dns/message.c b/lib/dns/message.c
index 541fafd056..ef71fa16eb 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -46,7 +46,7 @@ hexdump(const char *msg, const char *msg2, void *base, size_t len) {
 	p = base;
 	cnt = 0;
 
-	printf("*** %s [%s] (%u bytes @ %p)\n", msg, msg2, len, base);
+	printf("*** %s [%s] (%u bytes @ %p)\n", msg, msg2, (unsigned)len, base);
 
 	while (cnt < len) {
 		if (cnt % 16 == 0)
@@ -3862,11 +3862,11 @@ dns_message_pseudosectiontotext(dns_message_t *msg,
 				ADD_STRING(target, "; EXPIRE");
 			} else if (optcode == DNS_OPT_TCP_KEEPALIVE) {
 				if (optlen == 2) {
-					isc_uint16_t dsecs;
+					unsigned int dsecs;
 					dsecs = isc_buffer_getuint16(&optbuf);
 					ADD_STRING(target, "; TCP KEEPALIVE:");
 					snprintf(buf, sizeof(buf), " %u.%u",
-						 dsecs / 10, dsecs % 10);
+						 dsecs / 10U, dsecs % 10U);
 					ADD_STRING(target, buf);
 					ADD_STRING(target, " secs\n");
 					continue;
diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index af1c865cb8..262d77dd16 100644
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2005, 2007-2009, 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2005, 2007-2009, 2011-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -3020,7 +3020,7 @@ dns_rbt_printnodeinfo(dns_rbtnode_t *n, FILE *f) {
 			(n->down_is_relative == 1 ? " D" : ""),
 			(n->data_is_relative == 1 ? " T" : ""));
 
-	fprintf(f, "node lock address = %d\n", n->locknum);
+	fprintf(f, "node lock address = %u\n", n->locknum);
 
 	fprintf(f, "Parent: %p\n", n->parent);
 	fprintf(f, "Right: %p\n", n->right);
diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 204729c441..42d4e2dc05 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1460,6 +1460,7 @@ txt_totext(isc_region_t *source, isc_boolean_t quote, isc_buffer_t *target) {
 			return (ISC_R_NOSPACE);
 		*tp++ = '"';
 		tl--;
+		POST(tl);
 	}
 	isc_buffer_add(target, (unsigned int)(tp - (char *)region.base));
 	isc_region_consume(source, *source->base + 1);
@@ -1610,6 +1611,7 @@ multitxt_totext(isc_region_t *source, isc_buffer_t *target) {
 		return (ISC_R_NOSPACE);
 	*tp++ = '"';
 	tl--;
+	POST(tl);
 	isc_buffer_add(target, (unsigned int)(tp - (char *)region.base));
 	return (ISC_R_SUCCESS);
 }
diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c
index e80d7bcc40..6e32bc0858 100644
--- a/lib/dns/rdata/generic/loc_29.c
+++ b/lib/dns/rdata/generic/loc_29.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2005, 2007, 2009, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2005, 2007, 2009, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -552,7 +552,7 @@ totext_loc(ARGS_TOTEXT) {
 	}
 
 	snprintf(buf, sizeof(buf),
-		 "%d %d %d.%03d %s %d %d %d.%03d %s %s%ld.%02ldm %s %s %s",
+		 "%d %d %d.%03d %s %d %d %d.%03d %s %s%lu.%02lum %s %s %s",
 		 d1, m1, s1, fs1, north ? "N" : "S",
 		 d2, m2, s2, fs2, east ? "E" : "W",
 		 below ? "-" : "", altitude/100, altitude % 100,
diff --git a/lib/dns/rdata/in_1/dhcid_49.c b/lib/dns/rdata/in_1/dhcid_49.c
index c0d14a104c..ab72b38017 100644
--- a/lib/dns/rdata/in_1/dhcid_49.c
+++ b/lib/dns/rdata/in_1/dhcid_49.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2009, 2011, 2012, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2007, 2009, 2011, 2012, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -54,8 +54,8 @@ totext_in_dhcid(ARGS_TOTEXT) {
 		RETERR(str_totext(/* ( */ " )", target));
 		if (rdata->length > 2) {
 			n = snprintf(buf, sizeof(buf), " ; %u %u %u",
-				     sr2.base[0] * 256 + sr2.base[1],
-				     sr2.base[2], rdata->length - 3);
+				     sr2.base[0] * 256U + sr2.base[1],
+				     sr2.base[2], rdata->length - 3U);
 			INSIST(n < sizeof(buf));
 			RETERR(str_totext(buf, target));
 		}
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 9ab25b3c80..9075db70fe 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -9362,9 +9362,10 @@ rctx_badserver(respctx_t *rctx, isc_result_t result) {
 		}
 	} else if (fctx->rmessage->rcode == dns_rcode_badvers) {
 		unsigned int version;
-		isc_boolean_t setnocookie = ISC_FALSE;
 #if DNS_EDNS_VERSION > 0
 		unsigned int flags, mask;
+#else
+		isc_boolean_t setnocookie = ISC_FALSE;
 #endif
 
 		/*
@@ -9376,8 +9377,10 @@ rctx_badserver(respctx_t *rctx, isc_result_t result) {
 		 */
 		if (dns_adb_getcookie(fctx->adb, query->addrinfo,
 				      cookie, sizeof(cookie)) == 0U) {
+#if DNS_EDNS_VERSION <= 0
 			if (!NOCOOKIE(query->addrinfo))
 				setnocookie = ISC_TRUE;
+#endif
 			dns_adb_changeflags(fctx->adb, query->addrinfo,
 					    FCTX_ADDRINFO_NOCOOKIE,
 					    FCTX_ADDRINFO_NOCOOKIE);
@@ -11115,7 +11118,7 @@ dns_resolver_dumpfetches(dns_resolver_t *resolver,
 		     fc = ISC_LIST_NEXT(fc, link))
 		{
 			dns_name_print(fc->domain, fp);
-			fprintf(fp, ": %d active (%d spilled, %d allowed)\n",
+			fprintf(fp, ": %u active (%u spilled, %u allowed)\n",
 				fc->count, fc->dropped, fc->allowed);
 		}
 		UNLOCK(&resolver->dbuckets[i].lock);
diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index ea3e014fd4..3ac83bfe12 100644
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -703,12 +703,12 @@ ip2name(const dns_rpz_cidr_key_t *tgt_ip, dns_rpz_prefix_t tgt_prefix,
 	int i, n, len;
 
 	if (KEY_IS_IPV4(tgt_prefix, tgt_ip)) {
-		len = snprintf(str, sizeof(str), "%d.%d.%d.%d.%d",
-			       tgt_prefix - 96,
-			       tgt_ip->w[3] & 0xff,
-			       (tgt_ip->w[3]>>8) & 0xff,
-			       (tgt_ip->w[3]>>16) & 0xff,
-			       (tgt_ip->w[3]>>24) & 0xff);
+		len = snprintf(str, sizeof(str), "%u.%u.%u.%u.%u",
+			       tgt_prefix - 96U,
+			       tgt_ip->w[3] & 0xffU,
+			       (tgt_ip->w[3]>>8) & 0xffU,
+			       (tgt_ip->w[3]>>16) & 0xffU,
+			       (tgt_ip->w[3]>>24) & 0xffU);
 		if (len < 0 || len > (int)sizeof(str)) {
 			return (ISC_R_FAILURE);
 		}
diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c
index 2c346e9bff..0d4e3e8a00 100644
--- a/lib/dns/rrl.c
+++ b/lib/dns/rrl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -766,7 +766,7 @@ add_log_str(isc_buffer_t *lb, const char *str, unsigned int str_len) {
 
 	isc_buffer_availableregion(lb, &region);
 	if (str_len >= region.length) {
-		if (region.length <= 0)
+		if (region.length == 0U)
 			return;
 		str_len = region.length;
 	}
diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index 456a54bf9f..f415bad2b8 100644
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2003-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2003-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -104,10 +104,10 @@ typedef struct sdb_rdatasetiter {
 #define VALID_SDBNODE(sdbn)	VALID_SDBLOOKUP(sdbn)
 
 /* These values are taken from RFC1537 */
-#define SDB_DEFAULT_REFRESH	(60 * 60 * 8)
-#define SDB_DEFAULT_RETRY	(60 * 60 * 2)
-#define SDB_DEFAULT_EXPIRE	(60 * 60 * 24 * 7)
-#define SDB_DEFAULT_MINIMUM	(60 * 60 * 24)
+#define SDB_DEFAULT_REFRESH	28800U		/* 8 hours */
+#define SDB_DEFAULT_RETRY	7200U		/* 2 hours */
+#define SDB_DEFAULT_EXPIRE	604800U		/* 7 days */
+#define SDB_DEFAULT_MINIMUM	86400U		/* 1 day */
 
 /* This is a reasonable value */
 #define SDB_DEFAULT_TTL		(60 * 60 * 24)
diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index 6d0183320c..42cfbbda5b 100644
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 1999-2001, 2005-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1999-2001, 2005-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -41,8 +41,6 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
 /*! \file */
 
 #include <config.h>
@@ -149,10 +147,10 @@ typedef struct sdlz_rdatasetiter {
 #define VALID_SDLZNODE(sdlzn)	VALID_SDLZLOOKUP(sdlzn)
 
 /* These values are taken from RFC 1537 */
-#define SDLZ_DEFAULT_REFRESH	(60 * 60 * 8)
-#define SDLZ_DEFAULT_RETRY	(60 * 60 * 2)
-#define SDLZ_DEFAULT_EXPIRE	(60 * 60 * 24 * 7)
-#define SDLZ_DEFAULT_MINIMUM	(60 * 60 * 24)
+#define SDLZ_DEFAULT_REFRESH	28800U		/* 8 hours */
+#define SDLZ_DEFAULT_RETRY	7200U		/* 2 hours */
+#define SDLZ_DEFAULT_EXPIRE	604800U		/* 7 days */
+#define SDLZ_DEFAULT_MINIMUM	86400U		/* 1 day */
 
 /* This is a reasonable value */
 #define SDLZ_DEFAULT_TTL	(60 * 60 * 24)
diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c
index 377fd06fcb..de718a94ca 100644
--- a/lib/dns/spnego.c
+++ b/lib/dns/spnego.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1161,6 +1161,7 @@ der_put_int(unsigned char *p, size_t len, int val, size_t *size)
 				return (ASN1_OVERFLOW);
 			*p-- = 0;
 			len--;
+			POST(len);
 		}
 	} else {
 		val = ~val;
@@ -1176,6 +1177,7 @@ der_put_int(unsigned char *p, size_t len, int val, size_t *size)
 				return (ASN1_OVERFLOW);
 			*p-- = 0xff;
 			len--;
+			POST(len);
 		}
 	}
 	*size = base - p;
diff --git a/lib/dns/spnego_asn1.c b/lib/dns/spnego_asn1.c
index 83191fd79d..4a5091fddc 100644
--- a/lib/dns/spnego_asn1.c
+++ b/lib/dns/spnego_asn1.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2012, 2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2007, 2012, 2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -358,6 +358,7 @@ decode_ContextFlags(const unsigned char *p, size_t len, ContextFlags * data, siz
 		return ASN1_OVERRUN;
 	p++;
 	len--;
+	POST(len);
 	reallen--;
 	ret++;
 	data->delegFlag = (*p >> 7) & 1;
diff --git a/lib/dns/tcpmsg.c b/lib/dns/tcpmsg.c
index ec658923d0..3e30c106ae 100644
--- a/lib/dns/tcpmsg.c
+++ b/lib/dns/tcpmsg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2001, 2004-2007, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -113,7 +113,7 @@ recv_message(isc_task_t *task, isc_event_t *ev_in) {
 	tcpmsg->result = ISC_R_SUCCESS;
 	isc_buffer_add(&tcpmsg->buffer, ev->n);
 
-	XDEBUG(("Received %d bytes (of %d)\n", ev->n, tcpmsg->size));
+	XDEBUG(("Received %u bytes (of %d)\n", ev->n, tcpmsg->size));
 
  send_and_free:
 	isc_task_send(tcpmsg->task, &dev);
diff --git a/lib/dns/tests/rdatasetstats_test.c b/lib/dns/tests/rdatasetstats_test.c
index 3c32f8123a..5d9389adb2 100644
--- a/lib/dns/tests/rdatasetstats_test.c
+++ b/lib/dns/tests/rdatasetstats_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -54,6 +54,7 @@ set_nxdomainstats(dns_stats_t *stats, isc_boolean_t stale) {
 	dns_rdatasetstats_increment(stats, which);
 }
 
+#define ATTRIBUTE_SET(y) ((attributes & (y)) != 0)
 static void
 checkit1(dns_rdatastatstype_t which, isc_uint64_t value, void *arg) {
 	unsigned int attributes;
@@ -69,10 +70,10 @@ checkit1(dns_rdatastatstype_t which, isc_uint64_t value, void *arg) {
 	type = DNS_RDATASTATSTYPE_BASE(which);
 
 	fprintf(stderr, "%s%s%s%s/%u, %u\n",
-		attributes & DNS_RDATASTATSTYPE_ATTR_OTHERTYPE ? "O" : " ",
-		attributes & DNS_RDATASTATSTYPE_ATTR_NXRRSET ? "!" : " ",
-		attributes & DNS_RDATASTATSTYPE_ATTR_STALE ? "#" : " ",
-		attributes & DNS_RDATASTATSTYPE_ATTR_NXDOMAIN ? "X" : " ",
+		ATTRIBUTE_SET(DNS_RDATASTATSTYPE_ATTR_OTHERTYPE) ? "O" : " ",
+		ATTRIBUTE_SET(DNS_RDATASTATSTYPE_ATTR_NXRRSET) ? "!" : " ",
+		ATTRIBUTE_SET(DNS_RDATASTATSTYPE_ATTR_STALE) ? "#" : " ",
+		ATTRIBUTE_SET(DNS_RDATASTATSTYPE_ATTR_NXDOMAIN) ? "X" : " ",
 		type, (unsigned)value);
 #endif
 	if ((attributes & DNS_RDATASTATSTYPE_ATTR_STALE) == 0)
@@ -96,10 +97,10 @@ checkit2(dns_rdatastatstype_t which, isc_uint64_t value, void *arg) {
 	type = DNS_RDATASTATSTYPE_BASE(which);
 
 	fprintf(stderr, "%s%s%s%s/%u, %u\n",
-		attributes & DNS_RDATASTATSTYPE_ATTR_OTHERTYPE ? "O" : " ",
-		attributes & DNS_RDATASTATSTYPE_ATTR_NXRRSET ? "!" : " ",
-		attributes & DNS_RDATASTATSTYPE_ATTR_STALE ? "#" : " ",
-		attributes & DNS_RDATASTATSTYPE_ATTR_NXDOMAIN ? "X" : " ",
+		ATTRIBUTE_SET(DNS_RDATASTATSTYPE_ATTR_OTHERTYPE) ? "O" : " ",
+		ATTRIBUTE_SET(DNS_RDATASTATSTYPE_ATTR_NXRRSET) ? "!" : " ",
+		ATTRIBUTE_SET(DNS_RDATASTATSTYPE_ATTR_STALE) ? "#" : " ",
+		ATTRIBUTE_SET(DNS_RDATASTATSTYPE_ATTR_NXDOMAIN) ? "X" : " ",
 		type, (unsigned)value);
 #endif
 	if ((attributes & DNS_RDATASTATSTYPE_ATTR_STALE) == 0)
diff --git a/lib/dns/update.c b/lib/dns/update.c
index b6d794b23f..08a6575d19 100644
--- a/lib/dns/update.c
+++ b/lib/dns/update.c
@@ -1389,7 +1389,7 @@ dns_update_signaturesinc(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db,
 	unsigned int sigs = 0;
 	unsigned int maxsigs = dns_zone_getsignatures(zone);
 
-	if (statep == NULL || (statep != NULL && *statep == NULL)) {
+	if (statep == NULL || *statep == NULL) {
 		if (statep == NULL) {
 			state = &mystate;
 		} else {
diff --git a/lib/isc/log.c b/lib/isc/log.c
index 296f596318..c92b19f9d0 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2007, 2009, 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2007, 2009, 2011-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1281,8 +1281,8 @@ remove_old_tsversions(isc_logfile_t *file, int versions) {
 							      &digit_end, 10);
 				if (*digit_end == '\0') {
 					int i = 0;
-					while (version < to_keep[i] &&
-					       i < versions)
+					while (i < versions &&
+					       version < to_keep[i])
 					{
 						i++;
 					}
@@ -1353,7 +1353,7 @@ roll_increment(isc_logfile_t *file) {
 		 */
 		for (greatest = 0; greatest < INT_MAX; greatest++) {
 			n = snprintf(current, sizeof(current),
-				     "%s.%u", path, greatest) ;
+				     "%s.%u", path, (unsigned)greatest) ;
 			if (n >= (int)sizeof(current) || n < 0 ||
 			    !isc_file_exists(current))
 			{
@@ -1380,13 +1380,14 @@ roll_increment(isc_logfile_t *file) {
 
 	for (i = greatest; i > 0; i--) {
 		result = ISC_R_SUCCESS;
-		n = snprintf(current, sizeof(current), "%s.%u", path, i - 1);
+		n = snprintf(current, sizeof(current), "%s.%u", path,
+			     (unsigned)(i - 1));
 		if (n >= (int)sizeof(current) || n < 0) {
 			result = ISC_R_NOSPACE;
 		}
 		if (result == ISC_R_SUCCESS) {
 			n = snprintf(newpath, sizeof(newpath), "%s.%u",
-				     path, i);
+				     path, (unsigned)i);
 			if (n >= (int)sizeof(newpath) || n < 0) {
 				result = ISC_R_NOSPACE;
 			}
diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index b2898c6365..04e49e17c3 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -2297,7 +2297,7 @@ print_contexts(FILE *file) {
 	     ctx != NULL;
 	     ctx = ISC_LIST_NEXT(ctx, link))
 	{
-		fprintf(file, "context: %p (%s): %d references\n",
+		fprintf(file, "context: %p (%s): %u references\n",
 			ctx,
 			ctx->name[0] == 0 ? "<unknown>" : ctx->name,
 			ctx->references);
diff --git a/lib/isc/pthreads/thread.c b/lib/isc/pthreads/thread.c
index 78252dd78d..c07b35976d 100644
--- a/lib/isc/pthreads/thread.c
+++ b/lib/isc/pthreads/thread.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2003-2005, 2007, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2003-2005, 2007, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -28,7 +28,10 @@ isc_thread_create(isc_threadfunc_t func, isc_threadarg_t arg,
 		  isc_thread_t *thread)
 {
 	pthread_attr_t attr;
+#if defined(HAVE_PTHREAD_ATTR_GETSTACKSIZE) && \
+    defined(HAVE_PTHREAD_ATTR_SETSTACKSIZE)
 	size_t stacksize;
+#endif
 	int ret;
 
 	pthread_attr_init(&attr);
diff --git a/lib/isc/task.c b/lib/isc/task.c
index 3b73e595ed..2fe636972f 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1448,7 +1448,7 @@ isc__taskmgr_create(isc_mem_t *mctx, unsigned int workers,
 				      &manager->threads[manager->workers]) ==
 		    ISC_R_SUCCESS) {
 			char name[16];	/* thread name limit on Linux */
-			snprintf(name, sizeof(name), "isc-worker%04d", i);
+			snprintf(name, sizeof(name), "isc-worker%04u", i);
 			isc_thread_setname(manager->threads[manager->workers],
 					   name);
 			manager->workers++;
diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index 5648811ab7..cd1becd5c3 100644
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2009, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2009, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -555,7 +555,8 @@ internal_current4(isc_interfaceiter_t *iter) {
 			bits = 8 - prefixlen;
 			prefixlen = 0;
 		}
-		iter->current.netmask.type.in6.s6_addr[i] = (~0 << bits) & 0xff;
+		iter->current.netmask.type.in6.s6_addr[i] =
+			(~0U << bits) & 0xff;
 	}
 	return (ISC_R_SUCCESS);
 
@@ -749,7 +750,7 @@ internal_current6(isc_interfaceiter_t *iter) {
 			bits = lifreq.lifr_addrlen - i;
 			bits = (bits < 8) ? (8 - bits) : 0;
 			iter->current.netmask.type.in6.s6_addr[i / 8] =
-				(~0 << bits) & 0xff;
+				(~0U << bits) & 0xff;
 		}
 
 		return (ISC_R_SUCCESS);
diff --git a/lib/isc/win32/interfaceiter.c b/lib/isc/win32/interfaceiter.c
index 89c31e3746..8213eba0d4 100644
--- a/lib/isc/win32/interfaceiter.c
+++ b/lib/isc/win32/interfaceiter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2001, 2004, 2007-2009, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2001, 2004, 2007-2009, 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -388,7 +388,7 @@ internal_current6(isc_interfaceiter_t *iter) {
 		iter->current.flags = INTERFACE_F_UP;
 
 		snprintf(iter->current.name, sizeof(iter->current.name),
-			 "TCP/IPv6 Interface %d", iter->pos6 + 1);
+			 "TCP/IPv6 Interface %u", iter->pos6 + 1);
 
 		for (i = 0; i < 16; i++)
 			iter->current.netmask.type.in6.s6_addr[i] = 0xff;
diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index ffb7dadf8f..0fe6af2aa8 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -402,12 +402,12 @@ sock_dump(isc_socket_t *sock) {
 
 	printf("\n\t\tSock Dump\n");
 	printf("\t\tfd: %Iu\n", sock->fd);
-	printf("\t\treferences: %d\n", sock->references);
-	printf("\t\tpending_accept: %d\n", sock->pending_accept);
-	printf("\t\tconnecting: %d\n", sock->pending_connect);
-	printf("\t\tconnected: %d\n", sock->connected);
-	printf("\t\tbound: %d\n", sock->bound);
-	printf("\t\tpending_iocp: %d\n", sock->pending_iocp);
+	printf("\t\treferences: %u\n", sock->references);
+	printf("\t\tpending_accept: %u\n", sock->pending_accept);
+	printf("\t\tconnecting: %u\n", sock->pending_connect);
+	printf("\t\tconnected: %u\n", sock->connected);
+	printf("\t\tbound: %u\n", sock->bound);
+	printf("\t\tpending_iocp: %u\n", sock->pending_iocp);
 	printf("\t\tsocket type: %d\n", sock->type);
 
 	printf("\n\t\tSock Recv List\n");
diff --git a/lib/ns/client.c b/lib/ns/client.c
index 1d3b62a5eb..3b7240b6bd 100644
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -3974,7 +3974,7 @@ ns_client_dumprecursing(FILE *f, ns_clientmgr_t *manager) {
 		}
 		UNLOCK(&client->query.fetchlock);
 		fprintf(f, "; client %s%s%s: id %u '%s/%s/%s'%s%s "
-			"requesttime %d\n", peerbuf, sep, name,
+			"requesttime %u\n", peerbuf, sep, name,
 			client->message->id, namebuf, typebuf, classbuf,
 			origfor, original,
 			isc_time_seconds(&client->requesttime));
diff --git a/lib/ns/query.c b/lib/ns/query.c
index d1b2fcb6eb..e4d56917a9 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -5072,7 +5072,7 @@ query_trace(query_ctx_t *qctx) {
 		snprintf(qbuf, sizeof(qbuf), "<unset>");
 
 	snprintf(mbuf, sizeof(mbuf) - 1,
-		 "client attr:0x%x, query attr:0x%X, restarts:%d, "
+		 "client attr:0x%x, query attr:0x%X, restarts:%u, "
 		 "origqname:%s, timer:%d, authdb:%d, referral:%d",
 		 qctx->client->attributes,
 		 qctx->client->query.attributes,
diff --git a/lib/samples/nsprobe.c b/lib/samples/nsprobe.c
index c6366faa21..cff684c46e 100644
--- a/lib/samples/nsprobe.c
+++ b/lib/samples/nsprobe.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -627,7 +627,7 @@ request_done(isc_task_t *task, isc_event_t *event) {
 	} else if (rev->result == ISC_R_TIMEDOUT)
 		*resultp = timedout;
 	else {
-		fprintf(stderr, "unexpected result: %d (domain=%s, server=",
+		fprintf(stderr, "unexpected result: %u (domain=%s, server=",
 			rev->result, trans->domain);
 		print_address(stderr, &server->address);
 		fputc('\n', stderr);
@@ -1060,14 +1060,14 @@ main(int argc, char *argv[]) {
 	isc_lib_register();
 	result = dns_lib_init();
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "dns_lib_init failed: %d\n", result);
+		fprintf(stderr, "dns_lib_init failed: %u\n", result);
 		exit(1);
 	}
 
 	result = ctxs_init(&mctx, &actx, &taskmgr, &socketmgr,
 			   &timermgr);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "ctx create failed: %d\n", result);
+		fprintf(stderr, "ctx create failed: %u\n", result);
 		exit(1);
 	}
 
@@ -1076,7 +1076,7 @@ main(int argc, char *argv[]) {
 	result = dns_client_createx(mctx, actx, taskmgr, socketmgr,
 				    timermgr, 0, &client);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "dns_client_createx failed: %d\n", result);
+		fprintf(stderr, "dns_client_createx failed: %u\n", result);
 		exit(1);
 	}
 
@@ -1106,7 +1106,7 @@ main(int argc, char *argv[]) {
 	result = dns_client_setservers(client, dns_rdataclass_in, NULL,
 				       &servers);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "failed to set server: %d\n", result);
+		fprintf(stderr, "failed to set server: %u\n", result);
 		exit(1);
 	}
 
@@ -1114,7 +1114,7 @@ main(int argc, char *argv[]) {
 	probe_task = NULL;
 	result = isc_task_create(taskmgr, 0, &probe_task);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "failed to create task: %d\n", result);
+		fprintf(stderr, "failed to create task: %u\n", result);
 		exit(1);
 	}
 
diff --git a/lib/samples/resolve.c b/lib/samples/resolve.c
index 13c431a71a..f0b959dd3f 100644
--- a/lib/samples/resolve.c
+++ b/lib/samples/resolve.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2012-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2012-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -214,7 +214,7 @@ addserver(dns_client_t *client, const char *addrstr, const char *port,
 		name = dns_fixedname_name(&fname);
 		result = dns_name_fromtext(name, &b, dns_rootname, 0, NULL);
 		if (result != ISC_R_SUCCESS) {
-			fprintf(stderr, "failed to convert qname: %d\n",
+			fprintf(stderr, "failed to convert qname: %u\n",
 				result);
 			exit(1);
 		}
@@ -223,7 +223,7 @@ addserver(dns_client_t *client, const char *addrstr, const char *port,
 	result = dns_client_setservers(client, dns_rdataclass_in, name,
 				       &servers);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "set server failed: %d\n", result);
+		fprintf(stderr, "set server failed: %u\n", result);
 		exit(1);
 	}
 }
@@ -363,7 +363,7 @@ main(int argc, char *argv[]) {
 	isc_lib_register();
 	result = dns_lib_init();
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "dns_lib_init failed: %d\n", result);
+		fprintf(stderr, "dns_lib_init failed: %u\n", result);
 		exit(1);
 	}
 
@@ -393,7 +393,7 @@ main(int argc, char *argv[]) {
 	result = dns_client_createx2(mctx, actx, taskmgr, socketmgr, timermgr,
 				    clientopt, &client, addr4, addr6);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "dns_client_create failed: %d, %s\n", result,
+		fprintf(stderr, "dns_client_create failed: %u, %s\n", result,
 			isc_result_totext(result));
 		exit(1);
 	}
@@ -405,7 +405,7 @@ main(int argc, char *argv[]) {
 
 		result = irs_resconf_load(mctx, "/etc/resolv.conf", &resconf);
 		if (result != ISC_R_SUCCESS && result != ISC_R_FILENOTFOUND) {
-			fprintf(stderr, "irs_resconf_load failed: %d\n",
+			fprintf(stderr, "irs_resconf_load failed: %u\n",
 				result);
 			exit(1);
 		}
@@ -414,7 +414,7 @@ main(int argc, char *argv[]) {
 					       NULL, nameservers);
 		if (result != ISC_R_SUCCESS) {
 			irs_resconf_destroy(&resconf);
-			fprintf(stderr, "dns_client_setservers failed: %d\n",
+			fprintf(stderr, "dns_client_setservers failed: %u\n",
 				result);
 			exit(1);
 		}
@@ -446,7 +446,7 @@ main(int argc, char *argv[]) {
 	qname = dns_fixedname_name(&qname0);
 	result = dns_name_fromtext(qname, &b, dns_rootname, 0, NULL);
 	if (result != ISC_R_SUCCESS)
-		fprintf(stderr, "failed to convert qname: %d\n", result);
+		fprintf(stderr, "failed to convert qname: %u\n", result);
 
 	/* Perform resolution */
 	resopt = DNS_CLIENTRESOPT_ALLOWRUN;
diff --git a/lib/samples/sample-async.c b/lib/samples/sample-async.c
index 74f6e4fa29..2028c18a24 100644
--- a/lib/samples/sample-async.c
+++ b/lib/samples/sample-async.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -161,7 +161,7 @@ process_answer(isc_task_t *task, isc_event_t *event) {
 	printf("answer[%2d]\n", trans->id);
 
 	if (rev->result != ISC_R_SUCCESS)
-		printf("  failed: %d(%s)\n", rev->result,
+		printf("  failed: %u(%s)\n", rev->result,
 		       dns_result_totext(rev->result));
 
 	for (name = ISC_LIST_HEAD(rev->answerlist); name != NULL;
@@ -323,14 +323,14 @@ main(int argc, char *argv[]) {
 	isc_lib_register();
 	result = dns_lib_init();
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "dns_lib_init failed: %d\n", result);
+		fprintf(stderr, "dns_lib_init failed: %u\n", result);
 		exit(1);
 	}
 
 	result = ctxs_init(&mctx, &query_actx, &taskmgr, &socketmgr,
 			   &timermgr);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "ctx create failed: %d\n", result);
+		fprintf(stderr, "ctx create failed: %u\n", result);
 		exit(1);
 	}
 
@@ -339,7 +339,7 @@ main(int argc, char *argv[]) {
 	result = dns_client_createx(mctx, query_actx, taskmgr, socketmgr,
 				    timermgr, 0, &client);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "dns_client_createx failed: %d\n", result);
+		fprintf(stderr, "dns_client_createx failed: %u\n", result);
 		exit(1);
 	}
 
@@ -357,7 +357,7 @@ main(int argc, char *argv[]) {
 	result = dns_client_setservers(client, dns_rdataclass_in, NULL,
 				       &servers);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "set server failed: %d\n", result);
+		fprintf(stderr, "set server failed: %u\n", result);
 		exit(1);
 	}
 
@@ -365,7 +365,7 @@ main(int argc, char *argv[]) {
 	query_task = NULL;
 	result = isc_task_create(taskmgr, 0, &query_task);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "failed to create task: %d\n", result);
+		fprintf(stderr, "failed to create task: %u\n", result);
 		exit(1);
 	}
 
diff --git a/lib/samples/sample-request.c b/lib/samples/sample-request.c
index 11cfd0ec9b..b46616c08c 100644
--- a/lib/samples/sample-request.c
+++ b/lib/samples/sample-request.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2012-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -85,7 +85,7 @@ make_querymessage(dns_message_t *message, const char *namestr,
 	qname0 = dns_fixedname_name(&fixedqname);
 	result = dns_name_fromtext(qname0, &b, dns_rootname, 0, NULL);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "failed to convert qname: %d\n", result);
+		fprintf(stderr, "failed to convert qname: %u\n", result);
 		return (result);
 	}
 
@@ -175,13 +175,13 @@ main(int argc, char *argv[]) {
 	isc_lib_register();
 	result = dns_lib_init();
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "dns_lib_init failed: %d\n", result);
+		fprintf(stderr, "dns_lib_init failed: %u\n", result);
 		exit(1);
 	}
 
 	result = dns_client_create(&client, 0);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "dns_client_create failed: %d\n", result);
+		fprintf(stderr, "dns_client_create failed: %u\n", result);
 		exit(1);
 	}
 
diff --git a/lib/samples/sample-update.c b/lib/samples/sample-update.c
index 7be557e2d3..8e303cd19d 100644
--- a/lib/samples/sample-update.c
+++ b/lib/samples/sample-update.c
@@ -236,7 +236,7 @@ main(int argc, char *argv[]) {
 	isc_lib_register();
 	result = dns_lib_init();
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "dns_lib_init failed: %d\n", result);
+		fprintf(stderr, "dns_lib_init failed: %u\n", result);
 		exit(1);
 	}
 	result = isc_mem_create(0, 0, &umctx);
@@ -247,7 +247,7 @@ main(int argc, char *argv[]) {
 
 	result = dns_client_create(&client, 0);
 	if (result != ISC_R_SUCCESS) {
-		fprintf(stderr, "dns_client_create failed: %d\n", result);
+		fprintf(stderr, "dns_client_create failed: %u\n", result);
 		exit(1);
 	}
 
@@ -261,7 +261,7 @@ main(int argc, char *argv[]) {
 		zname = dns_fixedname_name(&zname0);
 		result = dns_name_fromtext(zname, &b, dns_rootname, 0, NULL);
 		if (result != ISC_R_SUCCESS)
-			fprintf(stderr, "failed to convert zone name: %d\n",
+			fprintf(stderr, "failed to convert zone name: %u\n",
 				result);
 	}
 
diff --git a/util/copyrights b/util/copyrights
index c55f5d78e7..6ae0ac498a 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -76,17 +76,17 @@
 ./bin/dig/.gitignore				X	2012,2014
 ./bin/dig/Makefile.in				MAKE	2000,2001,2002,2004,2005,2007,2009,2012,2013,2014,2015,2016,2017
 ./bin/dig/dig.1					MAN	DOCBOOK
-./bin/dig/dig.c					C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/dig/dig.c					C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/dig/dig.docbook				SGML	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017,2018
 ./bin/dig/dig.html				HTML	DOCBOOK
-./bin/dig/dighost.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/dig/dighost.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/dig/host.1				MAN	DOCBOOK
-./bin/dig/host.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/dig/host.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/dig/host.docbook				SGML	2000,2001,2002,2004,2005,2007,2008,2009,2014,2015,2016,2017
 ./bin/dig/host.html				HTML	DOCBOOK
-./bin/dig/include/dig/dig.h			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
+./bin/dig/include/dig/dig.h			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/dig/nslookup.1				MAN	DOCBOOK
-./bin/dig/nslookup.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/dig/nslookup.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/dig/nslookup.docbook			SGML	2004,2005,2006,2007,2010,2013,2014,2015,2016,2017
 ./bin/dig/nslookup.html				HTML	DOCBOOK
 ./bin/dig/win32/dig.vcxproj.filters.in		X	2013,2015
@@ -132,7 +132,7 @@
 ./bin/dnssec/dnssec-settime.docbook		SGML	2009,2010,2011,2014,2015,2016,2017
 ./bin/dnssec/dnssec-settime.html		HTML	DOCBOOK
 ./bin/dnssec/dnssec-signzone.8			MAN	DOCBOOK
-./bin/dnssec/dnssec-signzone.c			C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/dnssec/dnssec-signzone.c			C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/dnssec/dnssec-signzone.docbook		SGML	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
 ./bin/dnssec/dnssec-signzone.html		HTML	DOCBOOK
 ./bin/dnssec/dnssec-verify.8			MAN	DOCBOOK
@@ -214,7 +214,7 @@
 ./bin/named/unix/Makefile.in			MAKE	1999,2000,2001,2004,2007,2009,2011,2012,2016
 ./bin/named/unix/dlz_dlopen_driver.c		C	2011,2012,2013,2014,2016,2017
 ./bin/named/unix/include/named/os.h		C	1999,2000,2001,2002,2004,2005,2007,2008,2009,2014,2016,2017
-./bin/named/unix/os.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017
+./bin/named/unix/os.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017,2018
 ./bin/named/win32/dlz_dlopen_driver.c		C	2011,2012,2013,2014,2016
 ./bin/named/win32/include/named/ntservice.h	C	1999,2000,2001,2002,2003,2004,2007,2016
 ./bin/named/win32/include/named/os.h		C	1999,2000,2001,2002,2004,2007,2008,2009,2014,2016,2017
@@ -241,7 +241,7 @@
 ./bin/pkcs11/openssl-1.0.1t-patch		X	2016
 ./bin/pkcs11/openssl-1.0.2h-patch		X	2016
 ./bin/pkcs11/pkcs11-destroy.8			MAN	DOCBOOK
-./bin/pkcs11/pkcs11-destroy.c			X	2009,2010,2014,2015
+./bin/pkcs11/pkcs11-destroy.c			X	2009,2010,2014,2015,2018
 ./bin/pkcs11/pkcs11-destroy.docbook		SGML	2009,2014,2015,2016
 ./bin/pkcs11/pkcs11-destroy.html		HTML	DOCBOOK
 ./bin/pkcs11/pkcs11-keygen.8			MAN	DOCBOOK
@@ -249,7 +249,7 @@
 ./bin/pkcs11/pkcs11-keygen.docbook		SGML	2009,2014,2015,2016,2017
 ./bin/pkcs11/pkcs11-keygen.html			HTML	DOCBOOK
 ./bin/pkcs11/pkcs11-list.8			MAN	DOCBOOK
-./bin/pkcs11/pkcs11-list.c			C	2009,2014,2015,2016
+./bin/pkcs11/pkcs11-list.c			C	2009,2014,2015,2016,2018
 ./bin/pkcs11/pkcs11-list.docbook		SGML	2009,2014,2015,2016
 ./bin/pkcs11/pkcs11-list.html			HTML	DOCBOOK
 ./bin/pkcs11/pkcs11-tokens.8			MAN	DOCBOOK
@@ -433,7 +433,7 @@
 ./bin/tests/dst/Ktest.+003+49667.key.in		X	2001,2004,2013
 ./bin/tests/dst/Makefile.in			MAKE	1999,2000,2001,2002,2004,2006,2007,2008,2009,2010,2012,2013,2014,2016,2017
 ./bin/tests/dst/dst_2_data.in			X	1999,2000,2001,2013
-./bin/tests/dst/dst_test.c			C	1999,2000,2001,2004,2005,2007,2009,2012,2014,2015,2016
+./bin/tests/dst/dst_test.c			C	1999,2000,2001,2004,2005,2007,2009,2012,2014,2015,2016,2018
 ./bin/tests/dst/gsstest.c			C	2006,2007,2009,2010,2011,2013,2014,2015,2016
 ./bin/tests/dst/t2_data_1.in			X	1999,2000,2001,2013
 ./bin/tests/dst/t2_data_2.in			X	1999,2000,2001,2013
@@ -444,10 +444,10 @@
 ./bin/tests/dst/win32/t_dst.vcxproj.filters.in	X	2013,2015
 ./bin/tests/dst/win32/t_dst.vcxproj.in		X	2013,2015,2016,2017
 ./bin/tests/dst/win32/t_dst.vcxproj.user	X	2013
-./bin/tests/entropy2_test.c			C	2000,2001,2004,2005,2007,2015,2016
-./bin/tests/entropy_test.c			C	2000,2001,2004,2005,2007,2015,2016
+./bin/tests/entropy2_test.c			C	2000,2001,2004,2005,2007,2015,2016,2018
+./bin/tests/entropy_test.c			C	2000,2001,2004,2005,2007,2015,2016,2018
 ./bin/tests/fromhex.pl				PERL	2015,2016
-./bin/tests/fsaccess_test.c			C	2000,2001,2004,2005,2007,2012,2015,2016
+./bin/tests/fsaccess_test.c			C	2000,2001,2004,2005,2007,2012,2015,2016,2018
 ./bin/tests/hash_test.c				C	2000,2001,2004,2005,2006,2007,2014,2015,2016,2017
 ./bin/tests/hashes/Makefile.in			MAKE	2010,2012,2014,2016,2017
 ./bin/tests/hashes/t_hashes.c			C	2010,2013,2016
@@ -455,7 +455,7 @@
 ./bin/tests/hashes/win32/t_hashes.vcxproj.in	X	2013,2015,2016,2017
 ./bin/tests/hashes/win32/t_hashes.vcxproj.user	X	2013
 ./bin/tests/headerdep_test.sh.in		SH	2000,2001,2004,2007,2012,2016
-./bin/tests/inter_test.c			C	2000,2001,2003,2004,2005,2007,2008,2015,2016
+./bin/tests/inter_test.c			C	2000,2001,2003,2004,2005,2007,2008,2015,2016,2018
 ./bin/tests/keyboard_test.c			C	2000,2001,2004,2005,2007,2015,2016
 ./bin/tests/lex_test.c				C	1998,1999,2000,2001,2004,2005,2007,2015,2016
 ./bin/tests/lfsr_test.c				C	1999,2000,2001,2004,2005,2007,2015,2016
@@ -490,12 +490,12 @@
 ./bin/tests/master/win32/t_master.vcxproj.user	X	2013
 ./bin/tests/master_test.c			C	1999,2000,2001,2004,2007,2009,2015,2016,2017
 ./bin/tests/mem/Makefile.in			MAKE	1998,1999,2000,2001,2002,2004,2005,2007,2009,2012,2014,2016,2017
-./bin/tests/mem/t_mem.c				C	1999,2000,2001,2004,2007,2009,2013,2016
+./bin/tests/mem/t_mem.c				C	1999,2000,2001,2004,2007,2009,2013,2016,2018
 ./bin/tests/mem/win32/t_mem.vcxproj.filters.in	X	2013,2015
 ./bin/tests/mem/win32/t_mem.vcxproj.in		X	2013,2015,2016,2017
 ./bin/tests/mem/win32/t_mem.vcxproj.user	X	2013
 ./bin/tests/mempool_test.c			C	1999,2000,2001,2004,2007,2016
-./bin/tests/name_test.c				C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2015,2016,2017
+./bin/tests/name_test.c				C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2015,2016,2017,2018
 ./bin/tests/named.conf				CONF-C	1999,2000,2001,2004,2007,2011,2015,2016
 ./bin/tests/names/Makefile.in			MAKE	1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017
 ./bin/tests/names/dns_name_compare_data		X	1999,2000,2001
@@ -584,11 +584,11 @@
 ./bin/tests/rbt/dns_rbtnodechain_next_data	X	1999,2000,2001
 ./bin/tests/rbt/dns_rbtnodechain_prev.data	X	1999,2000,2001
 ./bin/tests/rbt/dns_rbtnodechain_prev_data	X	1999,2000,2001
-./bin/tests/rbt/t_rbt.c				C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2011,2012,2013,2015,2016
+./bin/tests/rbt/t_rbt.c				C	1998,1999,2000,2001,2003,2004,2005,2007,2009,2011,2012,2013,2015,2016,2018
 ./bin/tests/rbt/win32/t_rbt.vcxproj.filters.in	X	2013,2015
 ./bin/tests/rbt/win32/t_rbt.vcxproj.in		X	2013,2015,2016,2017
 ./bin/tests/rbt/win32/t_rbt.vcxproj.user	X	2013
-./bin/tests/rbt_test.c				C	1999,2000,2001,2004,2005,2007,2009,2011,2012,2014,2015,2016
+./bin/tests/rbt_test.c				C	1999,2000,2001,2004,2005,2007,2009,2011,2012,2014,2015,2016,2018
 ./bin/tests/rbt_test.out			X	1999,2000,2001
 ./bin/tests/rbt_test.txt			SH	1999,2000,2001,2004,2007,2012,2016
 ./bin/tests/resolv.conf.sample			CONF-SH	2000,2001,2004,2007,2012,2016
@@ -597,11 +597,11 @@
 ./bin/tests/resolver/win32/t_resolver.vcxproj.filters.in	X	2013,2015
 ./bin/tests/resolver/win32/t_resolver.vcxproj.in	X	2013,2015,2016,2017
 ./bin/tests/resolver/win32/t_resolver.vcxproj.user	X	2013
-./bin/tests/rwlock_test.c			C	1998,1999,2000,2001,2004,2005,2007,2013,2016,2017
+./bin/tests/rwlock_test.c			C	1998,1999,2000,2001,2004,2005,2007,2013,2016,2017,2018
 ./bin/tests/serial_test.c			C	1999,2000,2001,2003,2004,2007,2015,2016
-./bin/tests/shutdown_test.c			C	1998,1999,2000,2001,2004,2007,2011,2013,2016,2017
+./bin/tests/shutdown_test.c			C	1998,1999,2000,2001,2004,2007,2011,2013,2016,2017,2018
 ./bin/tests/sig0_test.c				C	2000,2001,2004,2005,2007,2008,2009,2012,2015,2016
-./bin/tests/sock_test.c				C	1998,1999,2000,2001,2004,2007,2008,2012,2013,2014,2015,2016,2017
+./bin/tests/sock_test.c				C	1998,1999,2000,2001,2004,2007,2008,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/sockaddr/Makefile.in		MAKE	1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017
 ./bin/tests/sockaddr/t_sockaddr.c		C	1999,2000,2001,2004,2007,2013,2016
 ./bin/tests/sockaddr/win32/t_sockaddr.vcxproj.filters.in	X	2013,2015
@@ -1993,7 +1993,7 @@
 ./bin/tests/system/rpz/Makefile.in		MAKE	2017
 ./bin/tests/system/rpz/ckdnsrps.sh		SH	2017
 ./bin/tests/system/rpz/clean.sh			SH	2011,2012,2013,2014,2016,2017
-./bin/tests/system/rpz/dnsrps.c			C	2017
+./bin/tests/system/rpz/dnsrps.c			C	2017,2018
 ./bin/tests/system/rpz/dnsrpzd-license.conf	X	2017
 ./bin/tests/system/rpz/dnsrpzd.conf		CONF-C	2017
 ./bin/tests/system/rpz/ns1/named.conf		CONF-C	2011,2013,2016,2017
@@ -2521,13 +2521,13 @@
 ./bin/tests/system/zonechecks/setup.sh		SH	2012,2013,2014,2015,2016,2017
 ./bin/tests/system/zonechecks/tests.sh		SH	2004,2007,2009,2012,2013,2014,2015,2016
 ./bin/tests/t_api.pl				PERL	1999,2000,2001,2004,2007,2012,2016
-./bin/tests/task_test.c				C	1998,1999,2000,2001,2004,2007,2013,2014,2015,2016
+./bin/tests/task_test.c				C	1998,1999,2000,2001,2004,2007,2013,2014,2015,2016,2018
 ./bin/tests/tasks/Makefile.in			MAKE	1998,1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017
-./bin/tests/tasks/t_tasks.c			C	1998,1999,2000,2001,2004,2005,2007,2009,2011,2013,2014,2015,2016
+./bin/tests/tasks/t_tasks.c			C	1998,1999,2000,2001,2004,2005,2007,2009,2011,2013,2014,2015,2016,2018
 ./bin/tests/tasks/win32/t_tasks.vcxproj.filters.in	X	2013,2015
 ./bin/tests/tasks/win32/t_tasks.vcxproj.in	X	2013,2015,2016,2017
 ./bin/tests/tasks/win32/t_tasks.vcxproj.user	X	2013,2015
-./bin/tests/timer_test.c			C	1998,1999,2000,2001,2004,2007,2013,2014,2015,2016
+./bin/tests/timer_test.c			C	1998,1999,2000,2001,2004,2007,2013,2014,2015,2016,2018
 ./bin/tests/timers/Makefile.in			MAKE	1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017
 ./bin/tests/timers/t_timers.c			C	1999,2000,2001,2004,2007,2008,2009,2011,2013,2016
 ./bin/tests/timers/win32/t_timers.vcxproj.filters.in	X	2013,2015
@@ -2609,7 +2609,7 @@
 ./bin/tools/arpaname.docbook			SGML	2009,2014,2015,2016
 ./bin/tools/arpaname.html			HTML	DOCBOOK
 ./bin/tools/dnstap-read.1			MAN	DOCBOOK
-./bin/tools/dnstap-read.c			C	2015,2016,2017
+./bin/tools/dnstap-read.c			C	2015,2016,2017,2018
 ./bin/tools/dnstap-read.docbook			SGML	2015,2016,2017
 ./bin/tools/dnstap-read.html			HTML	DOCBOOK
 ./bin/tools/genrandom.8				MAN	DOCBOOK
@@ -2617,7 +2617,7 @@
 ./bin/tools/genrandom.docbook			SGML	2009,2010,2011,2014,2015,2016
 ./bin/tools/genrandom.html			HTML	DOCBOOK
 ./bin/tools/mdig.1				MAN	DOCBOOK
-./bin/tools/mdig.c				C	2015,2016,2017
+./bin/tools/mdig.c				C	2015,2016,2017,2018
 ./bin/tools/mdig.docbook			SGML	2015,2016,2017
 ./bin/tools/mdig.html				HTML	DOCBOOK
 ./bin/tools/named-journalprint.8		MAN	DOCBOOK
@@ -3287,10 +3287,10 @@
 ./lib/dns/Kyuafile				X	2017
 ./lib/dns/Makefile.in				MAKE	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./lib/dns/acl.c					C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2013,2014,2016,2017
-./lib/dns/adb.c					C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/adb.c					C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/api					X	1999,2000,2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/badcache.c				C	2014,2015,2016
-./lib/dns/byaddr.c				C	2000,2001,2002,2003,2004,2005,2007,2009,2013,2016,2017
+./lib/dns/byaddr.c				C	2000,2001,2002,2003,2004,2005,2007,2009,2013,2016,2017,2018
 ./lib/dns/cache.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
 ./lib/dns/callbacks.c				C	1999,2000,2001,2004,2005,2007,2011,2012,2015,2016
 ./lib/dns/catz.c				C	2016,2017,2018
@@ -3309,12 +3309,12 @@
 ./lib/dns/dnstap.c				C	2015,2016,2017,2018
 ./lib/dns/dnstap.proto				X	2015
 ./lib/dns/ds.c					C	2002,2003,2004,2005,2006,2007,2010,2012,2014,2016
-./lib/dns/dst_api.c				C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/dst_api.c				C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/dst_gost.h				C	2014,2016
 ./lib/dns/dst_internal.h			C.NAI	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017
 ./lib/dns/dst_lib.c				C	1999,2000,2001,2004,2005,2007,2016
 ./lib/dns/dst_openssl.h				C	2002,2004,2005,2007,2008,2009,2011,2012,2015,2016
-./lib/dns/dst_parse.c				C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/dst_parse.c				C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/dst_parse.h				C.NAI	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2012,2014,2016,2017
 ./lib/dns/dst_pkcs11.h				C	2014,2016
 ./lib/dns/dst_result.c				C	1999,2000,2001,2004,2005,2007,2008,2012,2013,2014,2015,2016
@@ -3325,7 +3325,7 @@
 ./lib/dns/gen-unix.h				C	1999,2000,2001,2004,2005,2007,2009,2016
 ./lib/dns/gen-win32.h				C	1999,2000,2001,2004,2005,2006,2007,2009,2014,2016
 ./lib/dns/gen.c					C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017
-./lib/dns/geoip.c				C	2013,2014,2015,2016
+./lib/dns/geoip.c				C	2013,2014,2015,2016,2018
 ./lib/dns/gssapi_link.c				C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016
 ./lib/dns/gssapictx.c				C	2000,2001,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./lib/dns/hmac_link.c				C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
@@ -3443,8 +3443,8 @@
 ./lib/dns/lookup.c				C	2000,2001,2003,2004,2005,2007,2013,2016
 ./lib/dns/mapapi				X	2013,2017
 ./lib/dns/master.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/masterdump.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/message.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/masterdump.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/message.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/name.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./lib/dns/ncache.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017
 ./lib/dns/nsec.c				C	1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016
@@ -3468,13 +3468,13 @@
 ./lib/dns/pkcs11rsa_link.c			C	2014,2015,2016,2017
 ./lib/dns/portlist.c				C	2003,2004,2005,2006,2007,2014,2016
 ./lib/dns/private.c				C	2009,2011,2012,2015,2016,2017
-./lib/dns/rbt.c					C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/rbtdb.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/rbt.c					C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/rbtdb.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/rbtdb.h				C	1999,2000,2001,2004,2005,2007,2011,2012,2016
 ./lib/dns/rbtdb64.c				C	1999,2000,2001,2004,2005,2007,2016
 ./lib/dns/rbtdb64.h				C	1999,2000,2001,2004,2005,2007,2016
 ./lib/dns/rcode.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/rdata.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/rdata.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/rdata/any_255/tsig_250.c		C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2011,2012,2015,2016,2017
 ./lib/dns/rdata/any_255/tsig_250.h		C	1999,2000,2001,2004,2005,2007,2016
 ./lib/dns/rdata/ch_3/a_1.c			C	2005,2007,2009,2014,2015,2016,2017
@@ -3527,7 +3527,7 @@
 ./lib/dns/rdata/generic/l32_105.h		C	2013,2016
 ./lib/dns/rdata/generic/l64_106.c		C	2013,2014,2015,2016,2017
 ./lib/dns/rdata/generic/l64_106.h		C	2013,2016
-./lib/dns/rdata/generic/loc_29.c		C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2015,2016,2017
+./lib/dns/rdata/generic/loc_29.c		C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2015,2016,2017,2018
 ./lib/dns/rdata/generic/loc_29.h		C	1999,2000,2001,2004,2005,2007,2016
 ./lib/dns/rdata/generic/lp_107.c		C	2013,2015,2016,2017
 ./lib/dns/rdata/generic/lp_107.h		C	2013,2016
@@ -3617,7 +3617,7 @@
 ./lib/dns/rdata/in_1/aaaa_28.h			C	1999,2000,2001,2004,2005,2007,2016
 ./lib/dns/rdata/in_1/apl_42.c			C	2002,2004,2005,2007,2008,2009,2014,2015,2016
 ./lib/dns/rdata/in_1/apl_42.h			C	2002,2004,2005,2007,2016
-./lib/dns/rdata/in_1/dhcid_49.c			C	2006,2007,2009,2011,2012,2015,2016,2017
+./lib/dns/rdata/in_1/dhcid_49.c			C	2006,2007,2009,2011,2012,2015,2016,2017,2018
 ./lib/dns/rdata/in_1/dhcid_49.h			C	2006,2007,2016
 ./lib/dns/rdata/in_1/kx_36.c			C	1999,2000,2001,2003,2004,2005,2007,2009,2015,2016,2017
 ./lib/dns/rdata/in_1/kx_36.h			C	1999,2000,2001,2004,2005,2007,2016
@@ -3642,21 +3642,21 @@
 ./lib/dns/resolver.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/result.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./lib/dns/rootns.c				C	1999,2000,2001,2002,2004,2005,2007,2008,2010,2012,2013,2014,2015,2016,2017
-./lib/dns/rpz.c					C	2011,2012,2013,2014,2015,2016,2017
+./lib/dns/rpz.c					C	2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/rriterator.c				C	2009,2011,2012,2015,2016
-./lib/dns/rrl.c					C	2012,2013,2014,2015,2016,2017
-./lib/dns/sdb.c					C	2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./lib/dns/sdlz.c				C.PORTION	1999,2000,2001,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/rrl.c					C	2012,2013,2014,2015,2016,2017,2018
+./lib/dns/sdb.c					C	2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/sdlz.c				C.PORTION	1999,2000,2001,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/soa.c					C	2000,2001,2004,2005,2007,2009,2016
 ./lib/dns/spnego.asn1				X	2006
-./lib/dns/spnego.c				C	2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/dns/spnego.c				C	2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/spnego.h				C	2006,2007,2016
-./lib/dns/spnego_asn1.c				C	2006,2007,2012,2013,2015,2016
+./lib/dns/spnego_asn1.c				C	2006,2007,2012,2013,2015,2016,2018
 ./lib/dns/spnego_asn1.pl			PERL	2006,2007,2012,2016
 ./lib/dns/ssu.c					C	2000,2001,2003,2004,2005,2006,2007,2008,2010,2011,2013,2014,2016,2017,2018
 ./lib/dns/ssu_external.c			C	2011,2012,2013,2016,2017
 ./lib/dns/stats.c				C	2000,2001,2004,2005,2007,2008,2009,2012,2016
-./lib/dns/tcpmsg.c				C	1999,2000,2001,2004,2005,2006,2007,2015,2016
+./lib/dns/tcpmsg.c				C	1999,2000,2001,2004,2005,2006,2007,2015,2016,2018
 ./lib/dns/tests/Atffile				X	2011,2017
 ./lib/dns/tests/Kdh.+002+18602.key		X	2014
 ./lib/dns/tests/Krsa.+005+29235.key		X	2016
@@ -3686,7 +3686,7 @@
 ./lib/dns/tests/rbt_test.c			C	2012,2013,2014,2015,2016,2017
 ./lib/dns/tests/rdata_test.c			C	2012,2013,2015,2016,2017
 ./lib/dns/tests/rdataset_test.c			C	2012,2016
-./lib/dns/tests/rdatasetstats_test.c		C	2012,2015,2016
+./lib/dns/tests/rdatasetstats_test.c		C	2012,2015,2016,2018
 ./lib/dns/tests/rsa_test.c			C	2016
 ./lib/dns/tests/testdata/dbiterator/zone1.data	ZONE	2011,2012,2016
 ./lib/dns/tests/testdata/dbiterator/zone2.data	X	2011
@@ -3950,7 +3950,7 @@
 ./lib/isc/lex.c					C	1998,1999,2000,2001,2002,2003,2004,2005,2007,2013,2014,2015,2016,2017
 ./lib/isc/lfsr.c				C	1999,2000,2001,2002,2004,2005,2007,2016
 ./lib/isc/lib.c					C	1999,2000,2001,2004,2005,2007,2009,2013,2014,2015,2016
-./lib/isc/log.c					C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2016,2017
+./lib/isc/log.c					C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2016,2017,2018
 ./lib/isc/md5.c					C	2000,2001,2004,2005,2007,2009,2014,2015,2016,2017,2018
 ./lib/isc/mem.c					C	1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/mips/Makefile.in			MAKE	2007,2012,2016
@@ -3996,7 +3996,7 @@
 ./lib/isc/pthreads/include/isc/once.h		C	1999,2000,2001,2004,2005,2007,2016
 ./lib/isc/pthreads/include/isc/thread.h		C	1998,1999,2000,2001,2004,2005,2007,2013,2016,2017
 ./lib/isc/pthreads/mutex.c			C	2000,2001,2002,2004,2005,2007,2008,2011,2012,2014,2015,2016
-./lib/isc/pthreads/thread.c			C	2000,2001,2003,2004,2005,2007,2013,2016,2017
+./lib/isc/pthreads/thread.c			C	2000,2001,2003,2004,2005,2007,2013,2016,2017,2018
 ./lib/isc/quota.c				C	2000,2001,2004,2005,2007,2016
 ./lib/isc/radix.c				C	2007,2008,2009,2011,2012,2013,2014,2015,2016
 ./lib/isc/random.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2013,2014,2016,2017
@@ -4020,7 +4020,7 @@
 ./lib/isc/string.c				C	1999,2000,2001,2003,2004,2005,2006,2007,2011,2012,2014,2015,2016
 ./lib/isc/strtoul.c				C	2003,2004,2005,2007,2014,2016
 ./lib/isc/symtab.c				C	1996,1997,1998,1999,2000,2001,2004,2005,2007,2011,2012,2013,2016
-./lib/isc/task.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./lib/isc/task.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/taskpool.c				C	1999,2000,2001,2004,2005,2007,2011,2012,2013,2016
 ./lib/isc/tests/Atffile				X	2011,2017
 ./lib/isc/tests/Kyuafile			X	2017
@@ -4068,7 +4068,7 @@
 ./lib/isc/unix/file.c				C	2000,2001,2002,2004,2005,2007,2009,2011,2012,2013,2014,2015,2016,2017
 ./lib/isc/unix/fsaccess.c			C	2000,2001,2004,2005,2006,2007,2016
 ./lib/isc/unix/ifiter_getifaddrs.c		C	2003,2004,2005,2007,2008,2009,2014,2016
-./lib/isc/unix/ifiter_ioctl.c			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2014,2015,2016,2017
+./lib/isc/unix/ifiter_ioctl.c			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2014,2015,2016,2017,2018
 ./lib/isc/unix/ifiter_sysctl.c			C	1999,2000,2001,2002,2003,2004,2005,2007,2014,2015,2016
 ./lib/isc/unix/include/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012,2014,2016
 ./lib/isc/unix/include/isc/Makefile.in		MAKE	1998,1999,2000,2001,2004,2007,2012,2013,2014,2015,2016
@@ -4139,7 +4139,7 @@
 ./lib/isc/win32/include/isc/win32os.h		C	2002,2004,2007,2009,2015,2016
 ./lib/isc/win32/include/pkcs11/Makefile.in	MAKE	2014,2016
 ./lib/isc/win32/include/pkcs11/cryptoki.h	X	2014
-./lib/isc/win32/interfaceiter.c			C	1999,2000,2001,2004,2007,2008,2009,2013,2014,2015,2016
+./lib/isc/win32/interfaceiter.c			C	1999,2000,2001,2004,2007,2008,2009,2013,2014,2015,2016,2018
 ./lib/isc/win32/ipv6.c				C	1999,2000,2001,2004,2007,2016
 ./lib/isc/win32/keyboard.c			C	2000,2001,2004,2007,2016
 ./lib/isc/win32/libgen.h			C	2009,2016
@@ -4291,12 +4291,12 @@
 ./lib/samples/.gitignore			X	2013,2014
 ./lib/samples/Makefile-postinstall.in		MAKE	2009,2012,2013,2014,2016,2017
 ./lib/samples/Makefile.in			MAKE	2009,2012,2013,2014,2015,2016,2017
-./lib/samples/nsprobe.c				C	2009,2010,2011,2012,2013,2014,2015,2016
-./lib/samples/resolve.c				C	2009,2012,2013,2014,2015,2016,2017
+./lib/samples/nsprobe.c				C	2009,2010,2011,2012,2013,2014,2015,2016,2018
+./lib/samples/resolve.c				C	2009,2012,2013,2014,2015,2016,2017,2018
 ./lib/samples/rootkey.sh			SH	2013,2016
-./lib/samples/sample-async.c			C	2009,2013,2014,2015,2016
+./lib/samples/sample-async.c			C	2009,2013,2014,2015,2016,2018
 ./lib/samples/sample-gai.c			C	2009,2012,2013,2014,2015,2016
-./lib/samples/sample-request.c			C	2009,2012,2013,2014,2015,2016
+./lib/samples/sample-request.c			C	2009,2012,2013,2014,2015,2016,2018
 ./lib/samples/sample-update.c			C	2009,2010,2012,2013,2014,2015,2016,2017,2018
 ./lib/samples/win32/async.vcxproj.filters.in	X	2014,2015
 ./lib/samples/win32/async.vcxproj.in		X	2014,2015,2016,2017