MFV ntp-4.2.8p3 (r284990).

Approved by:	roberto, delphij
Security:	VuXML: 0d0f3050-1f69-11e5-9ba9-d050996490d0
Security:	http://bugs.ntp.org/show_bug.cgi?id=2853
Security:	https://www.kb.cert.org/vuls/id/668167
Security:	http://support.ntp.org/bin/view/Main/SecurityNotice#June_2015_NTP_Security_Vulnerabi

1 files changed, 51 insertions, 2 deletions

diff --git a/contrib/ntp/scripts/update-leap/update-leap.html b/contrib/ntp/scripts/update-leap/update-leap.html
index 3a731ac..21bb294 100644
--- a/contrib/ntp/scripts/update-leap/update-leap.html
+++ b/contrib/ntp/scripts/update-leap/update-leap.html
@@ -30,7 +30,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 
   <p>This document describes the use of the NTP Project's <code>update-leap</code> program.
 
-  <p>This document applies to version 4.2.8p2 of <code>update-leap</code>.
+  <p>This document applies to version 4.2.8p3 of <code>update-leap</code>.
 
 <div class="shortcontents">
 <h2>Short Contents</h2>
@@ -114,7 +114,56 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">/bin/bash: line 136: ./update-leap: Permission denied
+<pre class="example">    update-leap
+        Usage: $0 [options] [leapfile]
+
+        Verifies and if necessary, updates leap-second definition file
+
+        All arguments are optional: Default (or current value) shown: -s
+        Specify the URL of the master copy to download $LEAPSRC -d Specify
+        the filename on the local system $LEAPFILE -e Specify how long (in
+        days) before expiration the file is to be refreshed. Note that
+        larger values imply more frequent refreshes. "$PREFETCH" -f Specify
+        location of ntp.conf (used to make sure leapfile directive is
+        present and to default leapfile) $NTPCONF -F Force update even if
+        current file is OK and not close to expiring. -r Specify number of
+        times to retry on get failure $MAXTRIES -i Specify number of minutes
+        between retries $INTERVAL -l Use syslog for output (Implied if
+        CRONJOB is set) -L Don't use syslog for output -P Specify the syslog
+        facility for logging $LOGFAC -t Name of temporary file used in
+        validation $TMPFILE -q Only report errors to stdout -v Verbose
+        output
+
+        The following options are not (yet) implemented in the perl version:
+        -4 Use only IPv4 -6 Use only IPv6 -c Command to restart NTP after
+        installing a new file &lt;none&gt; - ntpd checks file daily -p 4|6 Prefer
+        IPv4 or IPv6 (as specified) addresses, but use either -z Specify
+        path for utilities $PATHLIST -Z Only use system path
+
+        $0 will validate the file currently on the local system
+
+        Ordinarily, the file is found using the "leapfile" directive in
+        $NTPCONF. However, an alternate location can be specified on the
+        command line.
+
+        If the file does not exist, is not valid, has expired, or is
+        expiring soon, a new copy will be downloaded. If the new copy
+        validates, it is installed and NTP is (optionally) restarted.
+
+        If the current file is acceptable, no download or restart occurs.
+
+        -c can also be used to invoke another script to perform
+        administrative functions, e.g. to copy the file to other local
+        systems.
+
+        This can be run as a cron job. As the file is rarely updated, and
+        leap seconds are announced at least one month in advance (usually
+        longer), it need not be run more frequently than about once every
+        three weeks.
+
+        For cron-friendly behavior, define CRONJOB=1 in the crontab.
+
+        Version $VERSION
 </pre>
   <div class="node">
 <p><hr>