[Bug 2763] Fix for different thresholds for forward and backward steps

bk: 551e42daWZoqEPweUrdOvGO5573pSw

diff --git a/ChangeLog b/ChangeLog
index 8fbb078308a380871ae2ac8e0d2f59814b7365f6..420b3e7c9367715ac2b38bdd0a3c555ffe4c9c92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 ---
+
+* [Bug 2763] Fix for different thresholds for forward and backward steps.
+---
 (4.2.8p2-RC2) 2015/04/03 Released by Harlan Stenn <stenn@ntp.org>
 
 * [Bug 2592] FLAG_TSTAMP_PPS cleanup for refclock_parse.c.

diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index c9519e8f11d89f00d3ae2ea2cb2e469e42bdd412..e47f83b976a2e6ae3a8f51c924550eeefdf75cd6 100644 (file)
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -1266,14 +1266,14 @@ loop_config(
                 * using it is that it's pointless, not that it goes wrong.
                 */
                if (  (clock_max_back == 0 || clock_max_back > 0.5)
-                  && (clock_max_fwd  == 0 || clock_max_fwd  > 0.5))
+                  || (clock_max_fwd  == 0 || clock_max_fwd  > 0.5))
                        select_loop(FALSE);
                break;
 
        case LOOP_MAX_FWD:      /* step threshold (step) */
                clock_max_fwd = freq;
                if (  (clock_max_back == 0 || clock_max_back > 0.5)
-                  && (clock_max_fwd  == 0 || clock_max_fwd  > 0.5))
+                  || (clock_max_fwd  == 0 || clock_max_fwd  > 0.5))
                        select_loop(FALSE);
                break;