merge cleanup

bk: 54fed3cad_f7FrEVReDjtArO0qeQ7g

diff --git a/ChangeLog b/ChangeLog
index 14392ea95fb0471e20b63490315793e90430db06..c0b94ebda0cb54d3710aabab5158c0cc6ee6d9a4 100644 (file)
--- 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 bc43cebfcedef4c0754fcd295d56d307b273e9ef..cbf3cda74215dd3ffd6b450306f77ae83a0c9efa 100644 (file)
--- 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