diff options
| author | cy <cy@FreeBSD.org> | 2018-01-12 02:49:18 +0000 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2018-01-12 02:49:18 +0000 |
| commit | b9ce633b81e535d353bcb15c50f96850fe2554c1 (patch) | |
| tree | f88a3174be8aa4c0be688f2bfb8685cb3e61d537 /etc | |
| parent | b537519d4bb023e8c59aa05e47a88125f659926e (diff) | |
| download | FreeBSD-src-b9ce633b81e535d353bcb15c50f96850fe2554c1.zip FreeBSD-src-b9ce633b81e535d353bcb15c50f96850fe2554c1.tar.gz | |
MFC 327737:
USNO and possibly others have misinterpreted the maining of the
leapseconds last-update field and incorrectly increment it when changing
the file even though the leapsecond data has not changed. For instance,
if a leapsecond file is obtained from USNO, when it expires it will not
be replaced by a newer file from other sources because it has an
incorrect later last-update (version).
This corrects r304780.
PR: 225029
Submitted by: ian
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/rc.d/ntpd | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd index 051f857..5391aec 100755 --- a/etc/rc.d/ntpd +++ b/etc/rc.d/ntpd @@ -144,9 +144,9 @@ ntpd_fetch_leapfile() { done ntp_ver_no_tmp=$(get_ntp_leapfile_ver $ntp_tmp_leapfile) ntp_expiry_tmp=$(get_ntp_leapfile_expiry $ntp_tmp_leapfile) - if [ "$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" -o \ - "$ntp_ver_no_tmp" -eq "$ntp_ver_no_db" -a \ - "$ntp_expiry_tmp" -gt "$ntp_expiry_db" ]; then + if [ "$ntp_expiry_tmp" -gt "$ntp_expiry_db" -o \ + "$ntp_expiry_tmp" -eq "$ntp_expiry_db" -a \ + "$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" ]; then $verbose using $url as $ntp_db_leapfile mv $ntp_tmp_leapfile $ntp_db_leapfile else |
