From: Dave Hart <hart@ntp.org>
Date: Sun, 19 Dec 2010 00:59:46 +0000 (+0000)
Subject: [Bug 1760] ntpd Windows interpolation cannot be disabled.
X-Git-Tag: NTP_4_2_7P97~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04113bc32596d02b15ab3f53f98fd30d88cf71ac;p=thirdparty%2Fntp.git

[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 260545106..9a0e917bd 100644
--- 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 44448a118..5188868ab 100644
--- 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;