From: Mark Andrews <marka@isc.org>
Date: Thu, 15 Feb 2018 01:38:22 +0000 (+1100)
Subject: use %u and preserve unsigned property
X-Git-Tag: v9.9.13rc1~85^2~23
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=ef0fb20613c16dc2bcdf149c4941d82938081ad8;p=thirdparty%2Fbind9.git

use %u and preserve unsigned property
---

diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index dc8c2c92044..51a97b84245 100644
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2015, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -446,12 +446,12 @@ ip2name(dns_rpz_cidr_t *cidr, const dns_rpz_cidr_key_t *tgt_ip,
 	    tgt_ip->w[0] == 0 &&
 	    tgt_ip->w[1] == 0 &&
 	    tgt_ip->w[2] == ADDR_V4MAPPED) {
-		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 == -1 || len > (int)sizeof(str))
 			return (ISC_R_FAILURE);
 	} else {
diff --git a/util/copyrights b/util/copyrights
index ea076f3b650..bd28718ec01 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -3093,7 +3093,7 @@
 ./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,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
+./lib/dns/rpz.c					C	2011,2012,2013,2014,2015,2018
 ./lib/dns/rriterator.c				C	2009,2011,2012
 ./lib/dns/rrl.c					C	2013,2014,2015,2017
 ./lib/dns/sdb.c					C	2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2015,2016,2018