From 838906b3cdbbf02818e98b42b734948deaa3d4f8 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 14 Mar 2019 19:42:28 +1100 Subject: [PATCH 1/2] isc_quota_* return unsigned int (cherry picked from commit a43d648b95923895353fa2bb531c260a99885fda) --- bin/named/server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/named/server.c b/bin/named/server.c index ca64b9dffe..939e906998 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -11481,13 +11481,13 @@ named_server_status(named_server_t *server, isc_buffer_t **text) { ? "ON" : "OFF"); CHECK(putstr(text, line)); - snprintf(line, sizeof(line), "recursive clients: %d/%d/%d\n", + snprintf(line, sizeof(line), "recursive clients: %u/%u/%u\n", isc_quota_getused(&server->sctx->recursionquota), isc_quota_getsoft(&server->sctx->recursionquota), isc_quota_getmax(&server->sctx->recursionquota)); CHECK(putstr(text, line)); - snprintf(line, sizeof(line), "tcp clients: %d/%d\n", + snprintf(line, sizeof(line), "tcp clients: %u/%u\n", isc_quota_getused(&server->sctx->tcpquota), isc_quota_getmax(&server->sctx->tcpquota)); CHECK(putstr(text, line)); From b30e5f11fb47894690d96fb8d51116c2fd4b2bac Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 14 Mar 2019 19:46:10 +1100 Subject: [PATCH 2/2] force promotion to unsigned int (cherry picked from commit 1eba2c5b060c1e8f30658f0f834ecc7fe0dac492) --- lib/dns/byaddr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c index 0ef75a34b5..e7104edb58 100644 --- a/lib/dns/byaddr.c +++ b/lib/dns/byaddr.c @@ -67,10 +67,10 @@ dns_byaddr_createptrname(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] & 0xffU), - (bytes[2] & 0xffU), - (bytes[1] & 0xffU), - (bytes[0] & 0xffU)); + ((unsigned int)bytes[3] & 0xffU), + ((unsigned int)bytes[2] & 0xffU), + ((unsigned int)bytes[1] & 0xffU), + ((unsigned int)bytes[0] & 0xffU)); } else if (address->family == AF_INET6) { size_t remaining;