[Git][NTPsec/ntpsec][master] Forward-port from Classic: [Bug 2965] Local clock didn't work since 4.2.8p4

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
0dde3fd9 by Martin Burnicki at 2016-03-20T22:37:41-04:00
Forward-port from Classic: [Bug 2965] Local clock didn't work since 4.2.8p4

- - - - -


2 changed files:

- NEWS
- ntpd/refclock_local.c


Changes:

=====================================
NEWS
=====================================
--- a/NEWS
+++ b/NEWS
@@ -8,13 +8,14 @@ on user-visible changes.
 
 == Repository head ==
 
-The following reflect forward-ported fixes to Classic:
+The following reflect forward-ported fixes from Classic:
 
 [Bug 2772] adj_systime overflows tv_usec
 [Bug 2829] Look at pipe_fds in ntpd.c
 [Bug 2887] fudge stratum only accepts values [0..16].
 [Bug 2937] (NTPQ) nextvar() missing length check
 [Bug 2958] ntpq: fatal error messages need a final newline. Craig Leres.
+[Bug 2965] Local clock didn't work since 4.2.8p4.
 
 == 2016-03-15: 0.9.2 ==
 


=====================================
ntpd/refclock_local.c
=====================================
--- a/ntpd/refclock_local.c
+++ b/ntpd/refclock_local.c
@@ -196,10 +196,11 @@ local_poll(
 	}
 	pp->disp = 0;
 	pp->jitter = 0;
-#else /* HAVE_KERNEL_PLL ENABLE_LOCKCLOCK */
+#else /* HAVE_KERNEL_PLL && ENABLE_LOCKCLOCK */
+	pp->leap = LEAP_NOWARNING;
 	pp->disp = DISPERSION;
 	pp->jitter = 0;
-#endif /* HAVE_KERNEL_PLL ENABLE_LOCKCLOCK */
+#endif /* HAVE_KERNEL_PLL && ENABLE_LOCKCLOCK */
 	pp->lastref = pp->lastrec;
 	refclock_receive(peer);
 }



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/0dde3fd9a35df7b4308f4228eb644725a913a6bd
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160321/57ab6ec3/attachment.html>