From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 3 Apr 2015 07:35:54 +0000 (-0400)
Subject: [Bug 2763] Fix for different thresholds for forward and backward steps
X-Git-Tag: NTP_4_2_8P2_RC3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a39d2e7a8097284995e01637a95464fe13c8fa9;p=thirdparty%2Fntp.git

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

bk: 551e42daWZoqEPweUrdOvGO5573pSw
---

diff --git a/ChangeLog b/ChangeLog
index 8fbb07830..420b3e7c9 100644
--- 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 c9519e8f1..e47f83b97 100644
--- 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;