d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make validation of the leap-seconds file unconditional.

Browse Source 
MFC after:	1 day
This commit is contained in:
Cy Schubert 2016-08-25 03:09:23 +00:00
parent 1ac66dd31d
commit 05174bd95f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=304782
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
etc/rc.d/ntpd
View File

@ -29,6 +29,8 @@ ntpd_precmd()
rc_flags="-g $rc_flags"
fi
ntpd_valid_leapfile
if [ ! -f $ntp_db_leapfile ]; then
ntpd_fetch_leapfile
fi
@ -78,6 +80,19 @@ get_ntp_leapfile_expiry() {
'^\([1-9][0-9]*\)$' \| 0
}
ntpd_valid_leapfile() {
# Refresh working leapfile with an invalid hash due to
# FreeBSD id header. Ntpd will ignore leapfiles with a
# mismatch hash. The file must be the virgin file from
# the source.
if [ -f $ntp_db_leapfile ]; then
grep -q '\$FreeBSD.*\$' $ntp_db_leapfile &&
cp -p $ntp_src_leapfile $ntp_db_leapfile
else
cp -p $ntp_src_leapfile $ntp_db_leapfile
fi
}
ntpd_fetch_leapfile() {
local ntp_tmp_leapfile rc verbose
@ -87,13 +102,6 @@ ntpd_fetch_leapfile() {
verbose=:
fi
# Refresh working leapfile with an invalid hash due to
# FreeBSD id header. Ntpd will ignore leapfiles with a
# mismatch hash. The file must be the virgin file from
# the source.
test -f $ntp_db_leapfile &&
grep -q '\$FreeBSD.*\$' $ntp_db_leapfile &&
cp -p $ntp_src_leapfile $ntp_db_leapfile
ntp_tmp_leapfile="/var/run/ntpd.leap-seconds.list"
ntp_ver_no_src=$(get_ntp_leapfile_ver $ntp_src_leapfile)