From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 5 Jul 2013 03:01:44 +0000 (-0400)
Subject: [Bug 2415] RES_LIMITED flags check should use &, not &&
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=741e038eb0fdae517bcb63ce2f9d4f4adb5edbbe;p=thirdparty%2Fntp.git

[Bug 2415] RES_LIMITED flags check should use &, not &&

bk: 51d63718fVlTNMZKfZuLEejC-LQYbg
---

diff --git a/ChangeLog b/ChangeLog
index 1c1f234992..38883fd987 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2415] RES_LIMITED flags check should use &, not &&.
 * Have NTP_LIBNTP check for time.h and clock_getres().
 * Fix ntpsweep to use sntp instead of ntpdate, from Oliver Kindernay.
 (4.2.7p368) 2013/05/01 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/ntpd/ntp_restrict.c b/ntpd/ntp_restrict.c
index 1985110379..6e7566713e 100644
--- a/ntpd/ntp_restrict.c
+++ b/ntpd/ntp_restrict.c
@@ -215,7 +215,7 @@ free_res(
 	restrict_u *	unlinked;
 
 	restrictcount--;
-	if (RES_LIMITED && res->flags)
+	if (RES_LIMITED & res->flags)
 		dec_res_limited();
 
 	if (v6)