From: Dave Hart <hart@ntp.org>
Date: Wed, 8 Feb 2012 07:25:26 +0000 (+0000)
Subject: [Bug 2131] Set the system variable settimeofday only after clock step.
X-Git-Tag: NTP_4_2_7P256~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fe1cb164b3e82a02f485e8182356ff336ea9825;p=thirdparty%2Fntp.git

[Bug 2131] Set the system variable settimeofday only after clock step.

bk: 4f322366-p79nEmFsYdn4E7PU327bA
---

diff --git a/ChangeLog b/ChangeLog
index 6856599a4..84250ee45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2131] Set the system variable settimeofday only after clock step.
 * [Bug 2134] --enable-C99-snprintf does not force rpl_snprintf use.
 (4.2.7p255) 2012/01/29 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 603] Only link with nlist()-related libraries when needed:
diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index eda00b4be..4aaf0caa1 100644
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -4352,14 +4352,6 @@ getconfig(
 	 */
 	set_tod_using = &ntpd_set_tod_using;
 
-	/*
-	 * On Windows, the variable has already been set, on the rest,
-	 * initialize it to "UNKNOWN".
-	 */
-#ifndef SYS_WINNT
-	strlcpy(line, "settimeofday=\"UNKNOWN\"", sizeof(line));
-	set_sys_var(line, strlen(line) + 1, RO);
-#endif
 	getCmdOpts(argc, argv);
 	init_syntax_tree(&cfgt);
 	curr_include_level = 0;
diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
index 4c6733c09..20495a7b1 100644
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -265,7 +265,6 @@ refclock_timer(
 	)
 {
 	struct refclockproc *	pp;
-	u_char			clktype;
 	int			unit;
 
 	unit = p->refclkunit;