Restore the original CLOCK_MONOTONIC output format in sntp

bk: 4e50967cyoWnBU-E_b16Ego1DjxEiA

diff --git a/ChangeLog b/ChangeLog
index 84eb031ba0ef1c848b9c1a1777b10e21ded16ec7..a02437c5c8c152ee5f77efcb491b6f1b28430934 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Restore the original CLOCK_MONOTONIC output format in sntp.
 * Cleanups for ntp-wait-opts.def and ntp.keys.def .
 (4.2.7p206) 2011/08/20 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1993] ntpd Windows port adj_systime() broken in 4.2.7p203.

diff --git a/sntp/main.c b/sntp/main.c
index 5b1e11bcd95e2b7057f0af15ceb05495e90babcd..25227b73bee6cf2d067683f5bbb3115aae90774d 100644 (file)
--- a/sntp/main.c
+++ b/sntp/main.c
@@ -1478,7 +1478,8 @@ gettimeofday_cached(
                        if (labs((long)diff.tv_sec) < 3600) {
                                /* older libevent2 using monotonic */
                                timeval_sub(&offset, &systemt, &mono);
-                               TRACE(1, ("%s: Offsetting libevent CLOCK_MONOTONIC times by %.6f\n", progname, offset));
+                               TRACE(1, ("%s: Offsetting libevent CLOCK_MONOTONIC times  by %+ld.%06ld\n",
+                                        (long)offset.tv_sec, offset.tv_usec));
                        }
                }
                offset_ready = TRUE;