[Bug 1760] ntpd Windows interpolation cannot be disabled.

Upgrade to libopts 34.0.9 from AutoGen 5.11.6pre5.
  applies to prior cset merged from ntp-stable-libopts-upstream

bk: 4d0d5902wGMGUnT3cUP8vjTv0W3ikw

diff --git a/ChangeLog b/ChangeLog
index 2605451065e88f89b4fa1eb6f47485f6a0595508..9a0e917bd976a2bbcb4f13c5e05af4d1636edf0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,8 @@
 * [Bug 1751] Support for Atari FreeMiNT OS.
 * [Bug 1754] --version output should be more verbose.
 * [Bug 1758] setsockopt IPV6_MULTICAST_IF with wrong ifindex.
-* Upgrade to libopts 33.5.8 from AutoGen 5.11.6pre3.
+* [Bug 1760] ntpd Windows interpolation cannot be disabled.
+* Upgrade to libopts 34.0.9 from AutoGen 5.11.6pre5.
 * Suppress ntp-keygen OpenSSL version display for --help, --version,
   display both build and runtime OpenSSL versions when they differ.
 * Clean up m4 quoting in configure.ac, *.m4 files, resolving

diff --git a/ports/winnt/ntpd/nt_clockstuff.c b/ports/winnt/ntpd/nt_clockstuff.c
index 44448a118b4c1bd027f8e21bc16fcec401c2be2b..5188868ab1a3239fe76738cb589a4cb98387731e 100644 (file)
--- a/ports/winnt/ntpd/nt_clockstuff.c
+++ b/ports/winnt/ntpd/nt_clockstuff.c
@@ -779,7 +779,9 @@ init_winnt_time(void)
 
        choose_interp_counter();
 
-       if (os_clock_precision < 4 * 10000 && !getenv("NTPD_USE_INTERP_DANGEROUS")) {
+       if (getenv("NTPD_USE_SYSTEM_CLOCK") ||
+           (os_clock_precision < 4 * 10000 &&
+            !getenv("NTPD_USE_INTERP_DANGEROUS"))) {
                msyslog(LOG_INFO, "using Windows clock directly");
        } else {
                winnt_use_interpolation = TRUE;