Fixes from Dave Mills

bk: 4179d967V52l5VdhnPTYFvCxFfPHzQ

diff --git a/ntpd/ntp_util.c b/ntpd/ntp_util.c
index acd829aa064f502bca278296584c35477b0feab9..7f2509270bc4b7141e3c0191521101b0139ed93a 100644 (file)
--- a/ntpd/ntp_util.c
+++ b/ntpd/ntp_util.c
@@ -535,7 +535,7 @@ record_loop_stats(
        day = now.l_ui / 86400 + MJD_1900;
        now.l_ui %= 86400;
        if (loopstats.fp != NULL) {
-               fprintf(loopstats.fp, "%lu %s %.9f %.6f %.9f %.3e %d\n",
+               fprintf(loopstats.fp, "%lu %s %.9f %.3f %.9f %.3f %d\n",
                    day, ulfptoa(&now, 3), offset, freq * 1e6, jitter,
                    stability * 1e6, spoll);
                fflush(loopstats.fp);

diff --git a/ntpd/refclock_atom.c b/ntpd/refclock_atom.c
index 0a52222c65368c819dfac1fbf66a80ed5262e16f..070f52089a87ddcea8f3ac8c619db5bb07868ff0 100644 (file)
--- a/ntpd/refclock_atom.c
+++ b/ntpd/refclock_atom.c
@@ -234,6 +234,7 @@ atom_ppsapi(
                return (0);
        }
        memset(&up->pps_params, 0, sizeof(pps_params_t));
+       up->pps_params.api_version = PPS_API_VERS_1;
        if (enb_clear)
                up->pps_params.mode = capability & PPS_CAPTURECLEAR;
        else