svn commit: r294884 - in head/etc: defaults rc.d

[Cy Schubert]

Author: cy
Date: Wed Jan 27 02:25:25 2016
New Revision: 294884
URL: https://svnweb.freebsd.org/changeset/base/294884

Log:
  Allow specification of fetch options for ntp leap-seconds fetch.
  
  MFC after:	1 week
  X-MFC with:	r289421, r293037, r294773

Modified:
  head/etc/defaults/rc.conf
  head/etc/rc.d/ntpd

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Wed Jan 27 02:23:54 2016	(r294883)
+++ head/etc/defaults/rc.conf	Wed Jan 27 02:25:25 2016	(r294884)
@@ -368,6 +368,8 @@ ntp_db_leapfile="/var/db/ntpd.leap-secon
 				# Working copy (updated weekly) leapfile
 ntp_leapfile_sources="https://www.ietf.org/timezones/data/leap-seconds.list"
 				# Source from which to fetch leapfile
+ntp_leapfile_fetch_opts="-mq"	# Options to use for ntp leapfile fetch,
+				# e.g. --no-verify-peer
 ntp_leapfile_expiry_days=30	# Check for new leapfile 30 days prior to
 				# expiry.
 ntp_leapfile_fetch_verbose="NO"	# Be verbose during NTP leapfile fetch

Modified: head/etc/rc.d/ntpd
==============================================================================
--- head/etc/rc.d/ntpd	Wed Jan 27 02:23:54 2016	(r294883)
+++ head/etc/rc.d/ntpd	Wed Jan 27 02:25:25 2016	(r294884)
@@ -105,7 +105,7 @@ ntpd_fetch_leapfile() {
 		$verbose Within ntp leapfile expiry limit, initiating fetch
 		for url in $ntp_leapfile_sources ; do
 			$verbose fetching $url
-			fetch -mqo $ntp_tmp_leapfile $url && break
+			fetch $ntp_leapfile_fetch_opts -o $ntp_tmp_leapfile $url && break
 		done
 		ntp_ver_no_tmp=$(get_ntp_leapfile_ver $ntp_tmp_leapfile)
 		if [ "$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" ]; then