upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-14 00:39:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[master] Fix a minor bug in isc_netaddr_masktoprefixlen

Browse source 
(cherry picked from commit f78603b534)
This commit is contained in:
Witold Krecicki 2016-09-23 14:56:53 +02:00 committed by Mark Andrews
parent 62b4b99d0e
commit f8e3534f18
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/isc/include/isc/netaddr.h
View file

@ -66,7 +66,7 @@ isc_result_t
isc_netaddr_masktoprefixlen(const isc_netaddr_t *s, unsigned int *lenp);
/*%<
* Convert a netmask in 's' into a prefix length in '*lenp'.
* The mask should consist of zero or more '1' bits in the most
* The mask should consist of zero or more '1' bits in the
* most significant part of the address, followed by '0' bits.
* If this is not the case, #ISC_R_MASKNONCONTIG is returned.
*

1
lib/isc/netaddr.c
View file

@ -279,7 +279,6 @@ isc_netaddr_masktoprefixlen(const isc_netaddr_t *s, unsigned int *lenp) {
for (; i < ipbytes; i++) {
if (p[i] != 0)
return (ISC_R_MASKNONCONTIG);
i++;
}
*lenp = nbytes * 8 + nbits;
return (ISC_R_SUCCESS);