svn commit: r327737 - head/etc/rc.d

[Cy Schubert]

Author: cy
Date: Tue Jan  9 20:35:58 2018
New Revision: 327737
URL: https://svnweb.freebsd.org/changeset/base/327737

Log:
  USNO and possibly others have misinterpreted the maining of the
  leapseconds last-update field and incorrectly increment it when changing
  the file even though the leapsecond data has not changed. For instance,
  if a leapsecond file is obtained from USNO, when it expires it will not
  be replaced by a newer file from other sources because it has an
  incorrect later last-update (version).
  
  This corrects r304780.
  
  PR:		225029
  Submitted by:	ian
  MFC after:	3 days

Modified:
  head/etc/rc.d/ntpd

Modified: head/etc/rc.d/ntpd
==============================================================================
--- head/etc/rc.d/ntpd	Tue Jan  9 19:41:10 2018	(r327736)
+++ head/etc/rc.d/ntpd	Tue Jan  9 20:35:58 2018	(r327737)
@@ -144,9 +144,9 @@ ntpd_fetch_leapfile() {
 		done
 		ntp_ver_no_tmp=$(get_ntp_leapfile_ver $ntp_tmp_leapfile)
 		ntp_expiry_tmp=$(get_ntp_leapfile_expiry $ntp_tmp_leapfile)
-		if [ "$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" -o \
-		     "$ntp_ver_no_tmp" -eq "$ntp_ver_no_db" -a \
-		     "$ntp_expiry_tmp" -gt "$ntp_expiry_db" ]; then
+		if [ "$ntp_expiry_tmp" -gt "$ntp_expiry_db" -o \
+		     "$ntp_expiry_tmp" -eq "$ntp_expiry_db" -a \
+		     "$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" ]; then
 			$verbose using $url as $ntp_db_leapfile
 			mv $ntp_tmp_leapfile $ntp_db_leapfile
 		else