diff options
author | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
commit | c62812877398840dae0ba74b03e9e6a43cc56fc5 (patch) | |
tree | 304551aa93f09787d4f56a966c6409faf1b1bcb0 /contrib/ntp/ntpd/refclock_local.c | |
parent | 9e809ce638c9be9ffb800ced1b91c0e8997f4c9e (diff) | |
download | FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.zip FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.tar.gz |
Upgrade NTP to 4.2.8p4.
Security: FreeBSD-SA-15:25.ntp
Security: CVE-2015-7871
Security: CVE-2015-7855
Security: CVE-2015-7854
Security: CVE-2015-7853
Security: CVE-2015-7852
Security: CVE-2015-7851
Security: CVE-2015-7850
Security: CVE-2015-7849
Security: CVE-2015-7848
Security: CVE-2015-7701
Security: CVE-2015-7703
Security: CVE-2015-7704, CVE-2015-7705
Security: CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
Diffstat (limited to 'contrib/ntp/ntpd/refclock_local.c')
-rw-r--r-- | contrib/ntp/ntpd/refclock_local.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/contrib/ntp/ntpd/refclock_local.c b/contrib/ntp/ntpd/refclock_local.c index d1b2871..d816c55 100644 --- a/contrib/ntp/ntpd/refclock_local.c +++ b/contrib/ntp/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 */ |