summaryrefslogtreecommitdiffstats
path: root/contrib/ntp/scripts/update-leap/update-leap.in
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2016-12-22 16:19:05 +0000
committerdelphij <delphij@FreeBSD.org>2016-12-22 16:19:05 +0000
commita5b8a0cee842e12aa090449e042788b9eabc35da (patch)
treec763313cbeed3fb4c2eaab81925e4718bb6d5a62 /contrib/ntp/scripts/update-leap/update-leap.in
parent897834470fcc320aaf75dc150ec701ce17c3491a (diff)
downloadFreeBSD-src-a5b8a0cee842e12aa090449e042788b9eabc35da.zip
FreeBSD-src-a5b8a0cee842e12aa090449e042788b9eabc35da.tar.gz
Fix multiple vulnerabilities of ntp.releng/10.1
Approved by: so
Diffstat (limited to 'contrib/ntp/scripts/update-leap/update-leap.in')
-rwxr-xr-xcontrib/ntp/scripts/update-leap/update-leap.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/ntp/scripts/update-leap/update-leap.in b/contrib/ntp/scripts/update-leap/update-leap.in
index a22b50a..bd7ed18 100755
--- a/contrib/ntp/scripts/update-leap/update-leap.in
+++ b/contrib/ntp/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;
}
}
OpenPOWER on IntegriCloud