ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

use %u and preserve unsigned property

Browse Source
This commit is contained in:
Mark Andrews
2018-02-15 12:38:22 +11:00
parent 8f3e807d19
commit a37769ca0d
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/dns/rpz.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2011-2017 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2011-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
@@ -690,14 +690,15 @@ 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);
if (len < 0 || len > (int)sizeof(str))
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);
}
} else {
len = snprintf(str, sizeof(str), "%d", tgt_prefix);
if (len == -1)

2
util/copyrights
View File

@@ -3433,7 +3433,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,2016,2017
./lib/dns/rpz.c C 2011,2012,2013,2014,2015,2016,2017,2018
./lib/dns/rriterator.c C 2009,2011,2012
./lib/dns/rrl.c C 2012,2013,2014,2015,2017
./lib/dns/sdb.c C 2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2018