From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 21 Jul 2018 04:25:55 +0000 (+0000)
Subject: [Bug 3426] ntpdate.html -t default is 2 seconds.  Leonid Evdokimov.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a18dfef01445e5392a8c4bd74761c268aa45845;p=thirdparty%2Fntp.git

[Bug 3426] ntpdate.html -t default is 2 seconds.  Leonid Evdokimov.

bk: 5b52b5d372pCQgjI3Ev46da54R0nXw
---

diff --git a/ChangeLog b/ChangeLog
index a3d788f70..29c037bd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ---
 
+* [Sec 3012] noepeer tweaks.  <stenn@ntp.org>
 * [Bug 3506] Service Control Manager interacts poorly with NTPD <perlinger@ntp.org>
   - changed interaction with SCM to signal pending startup
 * [Bug 3486] Buffer overflow in ntpq/ntpq.c:tstflags() <perlinger@ntp.org>
@@ -41,7 +42,7 @@
   New macro REFID_ISTEXT() which is also used in ntpd/ntp_control.c.
 * [Bug 3434] ntpd clears STA_UNSYNC on start <perlinger@ntp.org>
   - applied patch by Miroslav Lichvar
-* [Sec 3012] noepeer tweaks.  <stenn@ntp.org>
+* [Bug 3426] ntpdate.html -t default is 2 seconds.  Leonid Evdokimov.
 * [Bug 3121] Drop root privileges for the forked DNS worker <perlinger@ntp.org>
   - integrated patch by  Reinhard Max
 * [Bug 2821] minor build issues <perlinger@ntp.org>
diff --git a/html/ntpdate.html b/html/ntpdate.html
index 9216b6c05..56e100da3 100644
--- a/html/ntpdate.html
+++ b/html/ntpdate.html
@@ -11,7 +11,7 @@
 <img src="pic/rabbit.gif" alt="gif" align="left"><a href="http://www.eecis.udel.edu/~mills/pictures.html">from <i>Alice's Adventures in Wonderland</i>, Lewis Carroll</a>
 <p>I told you it was eyeball and wristwatch.</p>
 <p>Last update:
-  <!-- #BeginDate format:En2m -->9-Feb-2014  03:34<!-- #EndDate -->
+  <!-- #BeginDate format:En2m -->21-Jul-2018  04:09<!-- #EndDate -->
     UTC</p>
 <br clear="left">
 <hr>
@@ -63,7 +63,7 @@ Protocol (SNTP) Client</a> page.  After a suitable period of mourning, the <tt>n
   <dt><tt>-s</tt></dt>
   <dd>Divert logging output from the standard output (default) to the system <tt>syslog</tt> facility. This is designed primarily for convenience of <tt>cron</tt> scripts.</dd>
   <dt><tt>-t <i>timeout</i></tt></dt>
-  <dd>Specify the maximum time waiting for a server response as the value <i>timeout</i>, in seconds and fraction. The value is is rounded to a multiple of 0.2 seconds. The default is 1 second, a value suitable for polling across a LAN.</dd>
+  <dd>Specify the maximum time waiting for a server response as the value <i>timeout</i>, in seconds and fraction. The value is is rounded to a multiple of 0.2 seconds. The default is 2 seconds, a value suitable for polling across a LAN.</dd>
   <dt><tt>-u</tt></dt>
   <dd>Direct <tt>ntpdate</tt> to use an unprivileged port for outgoing packets. This is most useful when behind a firewall that blocks incoming traffic to privileged ports, and you want to synchronize with hosts beyond the firewall. Note that the <tt>-d</tt> option always uses unprivileged ports.
   <dt><tt>-<i>v</i></tt></dt>