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

bk: 51d63718fVlTNMZKfZuLEejC-LQYbg

diff --git a/ChangeLog b/ChangeLog
index 1c1f2349924a40a0fe8cf7d8a7fb7a32fcb2be82..38883fd98732f747aae0a213e0cfb75fd48ce0c5 100644 (file)
--- 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 19851103793e96c93230794d4f708978f6adc3e2..6e7566713e8d43f8fcff4569362f8a9974fd0ab0 100644 (file)
--- 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)