[ntpsec commit] Forward-port [Bug 2625] Deprecate flag1 in local refclock.

[Eric S. Raymond]

Module:    ntpsec
Branch:    master
Commit:    c55823c3c37cfd7b9015c56d2b3af0e824203953
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=c55823c3c37cfd7b9015c56d2b3af0e824203953

Author:    Eric S. Raymond <esr at thyrsus.com>
Date:      Thu Oct 22 22:58:53 2015 -0400

Forward-port [Bug 2625] Deprecate flag1 in local refclock.

---

 NEWS                  |  5 ++++-
 ntpd/refclock_local.c | 18 ++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/NEWS b/NEWS
index 1a427f3..75ef42c 100644
--- a/NEWS
+++ b/NEWS
@@ -6,8 +6,9 @@ Much of the traditional function of a news file is now better addressed
 by browsing the comments in the revision history.  This file will focus
 on user-visible changes.
 
-== Forward-ported bugfixes from NTP Classic ==
+== Bugfixes either ported from NTP Classic or fixed by NTPsec changes ==
 
+* [Bug 2625] Deprecate flag1 in local refclock.  Hal Murray, Harlan Stenn.
 * [Bug 2778] Implement "apeers"  ntpq command to include associd.
 * [Bug 2823] ntpsweep with recursive peers option doesn't work.  H.Stenn.
 * [Bug 2836] DFC77 patches from Frank Kardel to make decoding more
@@ -25,5 +26,7 @@ on user-visible changes.
 * [Bug 2866] segmentation fault at initgroups().  Harlan Stenn.
 * [Bug 2867] ntpd with autokey active crashed by 'ntpq -crv'
 * [Bug 2883] ntpd crashes on exit with empty driftfile.  Miroslav Lichvar.
+* [Bug 2886] Misspelling: "outlyer" should be "outlier"
+
 
 // end
diff --git a/ntpd/refclock_local.c b/ntpd/refclock_local.c
index 6a45d84..818d530 100644
--- a/ntpd/refclock_local.c
+++ b/ntpd/refclock_local.c
@@ -50,15 +50,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
@@ -166,9 +158,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);
@@ -202,10 +192,6 @@ local_poll(
 	pp->disp = 0;
 	pp->jitter = 0;
 #else /* HAVE_KERNEL_PLL ENABLE_LOCKCLOCK */
-	if (pp->sloppyclockflag & CLK_FLAG1)
-		pp->leap = LEAP_ADDSECOND;
-	else
-		pp->leap = LEAP_NOWARNING;
 	pp->disp = DISPERSION;
 	pp->jitter = 0;
 #endif /* HAVE_KERNEL_PLL ENABLE_LOCKCLOCK */