svn commit: r327859 - in stable: 10/etc/rc.d 11/etc/rc.d

[Cy Schubert]

Author: cy
Date: Fri Jan 12 02:49:18 2018
New Revision: 327859
URL: https://svnweb.freebsd.org/changeset/base/327859

Log:
  MFC 327737:
  
  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

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

Changes in other areas also in this revision:
Modified:
  stable/11/etc/rc.d/ntpd
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/etc/rc.d/ntpd
==============================================================================
--- stable/10/etc/rc.d/ntpd	Fri Jan 12 01:09:41 2018	(r327858)
+++ stable/10/etc/rc.d/ntpd	Fri Jan 12 02:49:18 2018	(r327859)
@@ -127,9 +127,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