From: Mark Andrews <marka@isc.org>
Date: Thu, 8 Sep 2016 04:16:56 +0000 (+1000)
Subject: 4465.   [bug]           Don't use "%z" as Windows doesn't support it.
X-Git-Tag: v9.11.0rc2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48ec547968d7da5b1240222c53a90efce25157a2;p=thirdparty%2Fbind9.git

4465.   [bug]           Don't use "%z" as Windows doesn't support it.
                        [RT #43131]

(cherry picked from commit f1977af0d3e400ac6debadd9fdd4c42e52645eb7)
---

diff --git a/CHANGES b/CHANGES
index d1adbf85b33..f382ac35b80 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4465.	[bug]		Don't use "%z" as Windows doesn't support it.
+			[RT #43131]
+
 4464.	[bug]		Fix windows python support. [RT #43173]
 
 4463.	[bug]		The dnstap system test failed on some systems.
diff --git a/bin/named/server.c b/bin/named/server.c
index bb122fb9c9b..4805a9f8b41 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -3481,10 +3481,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
 			cfg_obj_log(obj, ns_g_lctx,
 				ISC_LOG_INFO,
 				"'max-cache-size %d%%' "
-				"- setting to %zuMB (out of %zuMB)",
+				"- setting to %" ISC_PRINT_QUADFORMAT "uMB "
+				"(out of %" ISC_PRINT_QUADFORMAT "uMB)",
 				max_cache_size_percent,
-				max_cache_size / (1024*1024),
-				(size_t) (totalphys / (1024*1024)));
+				(isc_uint64_t)(max_cache_size / (1024*1024)),
+				totalphys / (1024*1024));
 		}
 	}