[Bug 2625] Deprecate flag1 in local refclock. Hal Murray, Harlan Stenn.

bk: 55b5a274JGa9MfqyRmB_5AIKLcHP6g

diff --git a/ChangeLog b/ChangeLog
index bd709145e968edc4e186581e87ecaf95bf698476..1cc4a83dbd55fea71e30227da4f99f47481f341c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ---
 
+* [Bug 2625] Deprecate flag1 in local refclock.  Hal Murray, Harlan Stenn.
 * [Bug 2817] Stop locking ntpd into memory by default under Linux.  H.Stenn.
 * [Bug 2823] ntpsweep with recursive peers option doesn't work.  H.Stenn.
 * [Bug 2849] Systems with more than one default route may never

diff --git a/ntpd/refclock_local.c b/ntpd/refclock_local.c
index d1b28718e993925811e65ff08d7306d9069aa233..d816c55c128121a63a2cd7e2c2f1a9e8b8cca92e 100644 (file)
--- a/ntpd/refclock_local.c
+++ b/ntpd/refclock_local.c
@@ -55,15 +55,7 @@
  *
  * Fudge Factors
  *
- * If fudge flag1 is lit, the leap second bit is set in the peer
- * status word. It should be set early in the day of a leap second
- * event and set dark on the day after the event.
- *
- * Note the fudge time1 and time2 have been deprecated. The fudge time1
- * was intended to apply a bias offset. This can be done using the Unix
- * date command. The fudge time2 was intended to apply a bias frequency.
- * This can be done using the frequency file and/or the freq
- * configuration command.
+ * None currently supported.
  */
 /*
  * Local interface definitions
@@ -179,9 +171,7 @@ local_poll(
        /*
         * Ramble through the usual filtering and grooming code, which
         * is essentially a no-op and included mostly for pretty
-        * billboards. We allow a one-time time adjustment using fudge
-        * time1 (s) and a continuous frequency adjustment using fudge
-        * time 2 (ppm).
+        * billboards.
         */
        poll_time = current_time;
        refclock_process_offset(pp, pp->lastrec, pp->lastrec, 0);
@@ -215,10 +205,6 @@ local_poll(
        pp->disp = 0;
        pp->jitter = 0;
 #else /* KERNEL_PLL LOCKCLOCK */
-       if (pp->sloppyclockflag & CLK_FLAG1)
-               pp->leap = LEAP_ADDSECOND;
-       else
-               pp->leap = LEAP_NOWARNING;
        pp->disp = DISPERSION;
        pp->jitter = 0;
 #endif /* KERNEL_PLL LOCKCLOCK */