summaryrefslogtreecommitdiffstats
path: root/contrib/ntp/scripts/lib/NTP/Util.pm
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2015-10-26 11:35:40 +0000
committerglebius <glebius@FreeBSD.org>2015-10-26 11:35:40 +0000
commitc62812877398840dae0ba74b03e9e6a43cc56fc5 (patch)
tree304551aa93f09787d4f56a966c6409faf1b1bcb0 /contrib/ntp/scripts/lib/NTP/Util.pm
parent9e809ce638c9be9ffb800ced1b91c0e8997f4c9e (diff)
downloadFreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.zip
FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.tar.gz
Upgrade NTP to 4.2.8p4.
Security: FreeBSD-SA-15:25.ntp Security: CVE-2015-7871 Security: CVE-2015-7855 Security: CVE-2015-7854 Security: CVE-2015-7853 Security: CVE-2015-7852 Security: CVE-2015-7851 Security: CVE-2015-7850 Security: CVE-2015-7849 Security: CVE-2015-7848 Security: CVE-2015-7701 Security: CVE-2015-7703 Security: CVE-2015-7704, CVE-2015-7705 Security: CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
Diffstat (limited to 'contrib/ntp/scripts/lib/NTP/Util.pm')
-rw-r--r--contrib/ntp/scripts/lib/NTP/Util.pm9
1 files changed, 8 insertions, 1 deletions
diff --git a/contrib/ntp/scripts/lib/NTP/Util.pm b/contrib/ntp/scripts/lib/NTP/Util.pm
index f37aeaa..69d4df1 100644
--- a/contrib/ntp/scripts/lib/NTP/Util.pm
+++ b/contrib/ntp/scripts/lib/NTP/Util.pm
@@ -139,7 +139,14 @@ sub ntp_sntp_line {
my @output = split / /;
$offset = $output[3];
- ($stratum = $output[7]) =~ s/s(\d{1,2})/$1/;
+ if (0) {
+ } elsif ($output[7] =~ /s(\d{1,2})/) {
+ $stratum = $1;
+ # warn "Found stratum at #7\n";
+ } elsif ($output[8] =~ /s(\d{1,2})/) {
+ $stratum = $1;
+ # warn "Found stratum at #8\n";
+ }
}
close $fh or croak "running sntp failed: $! (exit status $?)";
return ($offset, $stratum);
OpenPOWER on IntegriCloud