From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 6 Jul 2016 08:53:32 +0000 (-0700)
Subject: [Bug 3084] update-leap mis-parses the leapfile name
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1187274b52eebf40db1ae74e086a469a34c523c3;p=thirdparty%2Fntp.git

[Bug 3084] update-leap mis-parses the leapfile name

bk: 577cc70c5q6UVg6FFINrybhN0OUb8g
---

diff --git a/ChangeLog b/ChangeLog
index 027802168..bc5753844 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ---
 
 * [Bug 2961] sntp/tests/packetProcessing.c assumes AUTOKEY.  HStenn.
+* [Bug 3084] update-leap mis-parses the leapfile name.  HStenn.
 
 ---
 (4.2.8p8) 2016/06/02 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/scripts/update-leap/update-leap.in b/scripts/update-leap/update-leap.in
index a22b50a5a..bd7ed1805 100755
--- a/scripts/update-leap/update-leap.in
+++ b/scripts/update-leap/update-leap.in
@@ -34,7 +34,10 @@ my $QUIET = "";
 my $VERBOSE = "";
 
 # Where to get the file
-my $LEAPSRC="ftp://time.nist.gov/pub/leap-seconds.list";
+# Choices:
+#	https://www.ietf.org/timezones/data/leap-seconds.list
+#	ftp://time.nist.gov/pub/leap-seconds.list
+my $LEAPSRC="https://www.ietf.org/timezones/data/leap-seconds.list";
 my $LEAPFILE;
 
 # How many times to try to download new file
@@ -300,7 +303,7 @@ sub verifySHA {
 open(LF, $NTPCONF) || die "Can't open <$NTPCONF>: $!\n";
 while (<LF>) {
     chomp;
-    if (/^ *leapfile\s+(\S+)/) {
+    if (/^ *leapfile\s+"(\S+)"/) {
 	$LEAPFILE = $1;
     }
 }