system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 12:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow opt-out of automatic ntpd leapfile checking/fetching.

Browse source 
When a system has no internet connection, or when it is configured to obtain
ntpd leapfiles from some source other than the internet, or even when the
sysadmin has decided for some reason to customize ntp.conf to eliminate use
of the leapfile, the rc.d/ntpd script emits various error messages related
to the file.

This change allows setting the rc var ntp_db_leapfile to NONE to disable all
automatic processing related to that file in rc.d/ntpd.

Differential Revision:	https://reviews.freebsd.org/D22461
This commit is contained in:
Ian Lepore 2019-11-25 19:59:53 +00:00
parent 2bcfb938f4
commit 735c001b6b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=355100
1 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
libexec/rc/rc.d/ntpd
View file

@ -28,6 +28,16 @@ pidfile="${_ntp_default_dir}/${name}.pid"
load_rc_config $name
leapfile_is_disabled() {
# Return true (0) if automatic leapfile handling is disabled.
case "$ntp_db_leapfile" in
[Nn][Oo] | [Nn][Oo][Nn][Ee] )
return 0;;
* )
return 1;;
esac
}
can_run_nonroot()
{
# If the admin set what uid to use, we don't change it.
@ -107,7 +117,12 @@ ntpd_precmd()
command_args="${command_args} -g"
fi
# Make sure the leapfile is ready to use.
# Make sure the leapfile is ready to use, unless leapfile
# handling is disabled.
if leapfile_is_disabled; then
return
fi
ntpd_init_leapfile
if [ ! -f "${ntp_db_leapfile}" ]; then
ntpd_fetch_leapfile
@ -135,6 +150,11 @@ get_ntp_leapfile_expiry() {
}
ntpd_init_leapfile() {
if leapfile_is_disabled; then
return
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
@ -146,7 +166,12 @@ ntpd_init_leapfile() {
ntpd_needfetch_leapfile() {
local rc verbose
if leapfile_is_disabled; then
# Return code 1: ntp leapfile fetch not needed
return 1
fi
if checkyesno ntp_leapfile_fetch_verbose; then
verbose=echo
else
@ -182,6 +207,11 @@ ntpd_needfetch_leapfile() {
}
ntpd_fetch_leapfile() {
if leapfile_is_disabled; then
return
fi
if checkyesno ntp_leapfile_fetch_verbose; then
verbose=echo
else