From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 10 Mar 2015 11:21:46 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_8~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0c3b1b64d54d621ef9332df16dda6396b4e53bf;p=thirdparty%2Fntp.git

merge cleanup

bk: 54fed3cad_f7FrEVReDjtArO0qeQ7g
---

diff --git a/ChangeLog b/ChangeLog
index 14392ea95..c0b94ebda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,3 @@
-
-* [Bug 2774] Unreasonably verbose printout - leap pending/warning
-
 ---
 
 * [Bug 2728] See if C99-style structure initialization works.
@@ -14,6 +11,7 @@
 * [Bug 2767] ntp-keygen -M should symlink to ntp.keys.
 * [Bug 2771] nonvolatile value is documented in wrong units.
 * [Bug 2773] Early leap announcement from Palisade/Thunderbolt
+* [Bug 2774] Unreasonably verbose printout - leap pending/warning
 * [Bug 2775] ntp-keygen.c fails to compile under Windows.
 * [Bug 2783] Quiet autoconf warnings about missing AC_LANG_SOURCE.
 ---
diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index bc43cebfc..cbf3cda74 100644
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -708,9 +708,12 @@ local_clock(
 		 * frequency and jitter.
 		 */
 		ntp_adj_ret = ntp_adjtime(&ntv);
+		/*
+		 * A squeal is a return status < 0, or a state change.
+		 */
 		if ((0 > ntp_adj_ret) || (ntp_adj_ret != kernel_status)) {
-		    kernel_status = ntp_adj_ret;
-		    ntp_adjtime_error_handler(__func__, &ntv, ntp_adj_ret, errno, hardpps_enable, 0, __LINE__ - 1);
+			kernel_status = ntp_adj_ret;
+			ntp_adjtime_error_handler(__func__, &ntv, ntp_adj_ret, errno, hardpps_enable, 0, __LINE__ - 1);
 		}
 		pll_status = ntv.status;
 #ifdef STA_NANO