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

bk: 4f322366-p79nEmFsYdn4E7PU327bA

diff --git a/ChangeLog b/ChangeLog
index 6856599a4fdf6601cc7634e8633ca5968ad690a3..84250ee4511d6e9ce40b2ba75361f89507379a93 100644 (file)
--- 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 eda00b4be923c955a97e9b811c8ccdb14b0925fc..4aaf0caa124f428c1f344e723ba768d35a355586 100644 (file)
--- 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 4c6733c095411f6e7b2e21c0c7b494c983062b68..20495a7b1b7c4557929fbdd8a639f4296d5870fd 100644 (file)
--- 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;