[Bug 2156] clock instability with LOCAL driver, from Miroslav Lichvar.

bk: 4f5b8f11p30hGnPSm_dTxrGxrnsVwA

diff --git a/ChangeLog b/ChangeLog
index 83bb2e3d17e0b3b37a3dde30b34b0079facd83d9..29b6f552c12f74823e4b3898468fc551e0957300 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2156] clock instability with LOCAL driver, from Miroslav Lichvar.
 (4.2.7p262) 2012/02/29 Released by Harlan Stenn <stenn@ntp.org>
 * Improve ntpd scalability for servers with many trusted keys.
 (4.2.7p261) 2012/02/27 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 8e325469c6f5d8acbfcb67868445b2b35f9dd353..787ea560a567bd670d1402be50a8ba16846f6ca5 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2665,7 +2665,7 @@ clock_select(void)
         */
        if (nlist == 0) {
                peers[0].error = 0;
-               peers[0].synch = 0;
+               peers[0].synch = sys_mindisp;
 #ifdef REFCLOCK
                if (typeacts != NULL) {
                        peers[0].peer = typeacts;