svn commit: r300897 - stable/10/etc/rc.d

[Cy Schubert]

Author: cy
Date: Sat May 28 03:33:06 2016
New Revision: 300897
URL: https://svnweb.freebsd.org/changeset/base/300897

Log:
  MFC r300638:
  
  Use the expiry date to determine whether to replace the DB copy of
  leapfile instead of using the leapfile serial number (create
  timestamp).
  
  PR:		209577

Modified:
  stable/10/etc/rc.d/ntpd
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/ntpd
==============================================================================
--- stable/10/etc/rc.d/ntpd	Sat May 28 02:14:24 2016	(r300896)
+++ stable/10/etc/rc.d/ntpd	Sat May 28 03:33:06 2016	(r300897)
@@ -107,8 +107,8 @@ ntpd_fetch_leapfile() {
 			$verbose fetching $url
 			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
+		ntp_expiry_tmp=$(get_ntp_leapfile_expiry $ntp_tmp_leapfile)
+		if [ "$ntp_expiry_tmp" -gt "$ntp_leap_expiry" ]; then
 			$verbose using $url as $ntp_db_leapfile
 			mv $ntp_tmp_leapfile $ntp_db_leapfile
 		else