From 1497b1541845a0d122b813b2de4b0cf96e4db0a6 Mon Sep 17 00:00:00 2001
From: cy <cy@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 28 May 2016 03:33:06 +0000
Subject: [PATCH] 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


git-svn-id: svn://svn.freebsd.org/base/stable/10@300897 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 etc/rc.d/ntpd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd
index fe2fc4ba5..91785b3ce 100755
--- a/etc/rc.d/ntpd
+++ b/etc/rc.d/ntpd
@@ -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
-- 
2.42.0