diff -up ntp-4.2.6p4/html/authopt.html.htmldoc ntp-4.2.6p4/html/authopt.html --- ntp-4.2.6p4/html/authopt.html.htmldoc 2011-07-11 04:18:25.000000000 +0200 +++ ntp-4.2.6p4/html/authopt.html 2011-10-05 17:30:09.463244610 +0200 @@ -364,7 +364,7 @@ UTC</p> are left unspecified, the default names are used as described below. Unless the complete path and name of the file are specified, the location of a file is relative to the keys directory specified in the <tt>keysdir</tt> configuration - command or default <tt>/usr/local/etc</tt>. Following are the options.</dd> + command or default <tt>/etc/ntp/crypto</tt>. Following are the options.</dd> <dd><dl> @@ -396,7 +396,7 @@ UTC</p> <dd>Specifies the complete path to the MD5 key file containing the keys and key IDs used by <tt>ntpd</tt>, <tt>ntpq</tt> and <tt>ntpdc</tt> when operating with symmetric key cryptography. This is the same operation as the <tt>-k </tt>command line option. Note that the directory path for Autokey media is specified by the <tt>keysdir</tt> command.</dd> <dt id="keysdir"><tt>keysdir <i>path</i></tt>K</dt> -<dd>This command specifies the default directory path for Autokey cryptographic keys, parameters and certificates. The default is <tt>/usr/local/etc/</tt>. Note that the path for the symmetric keys file is specified by the <tt>keys</tt> command.</dd> +<dd>This command specifies the default directory path for Autokey cryptographic keys, parameters and certificates. The default is <tt>/etc/ntp/crypto</tt>. Note that the path for the symmetric keys file is specified by the <tt>keys</tt> command.</dd> <dt id="requestkey"><tt>requestkey <i>keyid</i></tt></dt> <dd>Specifies the key ID to use with the diff -up ntp-4.2.6p4/html/keygen.html.htmldoc ntp-4.2.6p4/html/keygen.html --- ntp-4.2.6p4/html/keygen.html.htmldoc 2011-07-11 04:18:26.000000000 +0200 +++ ntp-4.2.6p4/html/keygen.html 2011-10-05 17:30:09.463244610 +0200 @@ -206,7 +206,6 @@ <p>All cryptographically sound key generation schemes must have means to randomize the entropy seed used to initialize the internal pseudo-random number generator used by the OpenSSL library routines. If a site supports <tt>ssh</tt>, it is very likely that means to do this are already available. The entropy seed used by the OpenSSL library is contained in a file, usually called <tt>.rnd</tt>, which must be available when starting the <tt>ntp-keygen</tt> program or <tt>ntpd</tt> daemon.</p> <p>The OpenSSL library looks for the file using the path specified by the <tt>RANDFILE</tt> environment variable in the user home directory, whether root or some other user. If the <tt>RANDFILE</tt> environment variable is not present, the library looks for the <tt>.rnd</tt> file in the user home directory. Since both the <tt>ntp-keygen</tt> program and <tt>ntpd</tt> daemon must run as root, the logical place to put this file is in <tt>/.rnd</tt> or <tt>/root/.rnd</tt>. If the file is not available or cannot be written, the program exits with a message to the system log.</p> -<p>On systems that provide /dev/urandom, the randomness device is used instead and the file specified by the <tt>randfile</tt> subcommand or the <tt>RANDFILE</tt> environment variable is ignored.</p> <h4 id="priv">Cryptographic Data Files</h4> diff -up ntp-4.2.6p4/html/ntpd.html.htmldoc ntp-4.2.6p4/html/ntpd.html --- ntp-4.2.6p4/html/ntpd.html.htmldoc 2011-07-11 04:18:26.000000000 +0200 +++ ntp-4.2.6p4/html/ntpd.html 2011-10-05 17:34:07.545384008 +0200 @@ -214,14 +214,14 @@ </tr> <tr> <td width="30%">statistics path</td> - <td width="30%"><tt>/var/NTP</tt></td> + <td width="30%"><tt>/var/log/ntpstats/</tt></td> <td width="20%"><tt>-s</tt></td> <td width="20%"><tt>statsdir</tt></td> </tr> <tr> <td width="30%">keys path</td> - <td width="30%"><tt>/usr/local/etc</tt></td> - <td width="20%"><tt>-k</tt></td> + <td width="30%"><tt>/etc/ntp/crypto</tt></td> + <td width="20%"><tt>none</tt></td> <td width="20%"><tt>keysdir</tt></td> </tr> </table> diff -up ntp-4.2.6p4/html/ntpdate.html.htmldoc ntp-4.2.6p4/html/ntpdate.html --- ntp-4.2.6p4/html/ntpdate.html.htmldoc 2011-10-05 17:30:09.438244595 +0200 +++ ntp-4.2.6p4/html/ntpdate.html 2011-10-05 17:36:24.195463971 +0200 @@ -43,7 +43,7 @@ <dt><tt>-e <i>authdelay</i></tt> <dd>Specify the processing delay to perform an authentication function as the value <i>authdelay</i>, in seconds and fraction (see <tt>ntpd</tt> for details). This number is usually small enough to be negligible for most purposes, though specifying a value may improve timekeeping on very slow CPU's. <dt><tt>-k <i>keyfile</i></tt> - <dd>Specify the path for the authentication key file as the string <i>keyfile</i>. The default is <tt>/etc/ntp.keys</tt>. This file should be in the format described in <tt>ntpd</tt>. + <dd>Specify the path for the authentication key file as the string <i>keyfile</i>. The default is <tt>/etc/ntp/keys</tt>. This file should be in the format described in <tt>ntpd</tt>. <dt><tt>-o <i>version</i></tt> <dd>Specify the NTP version for outgoing packets as the integer <i>version</i>, which can be 1 or 2. The default is 4. This allows <tt>ntpdate</tt> to be used with older NTP versions. <dt><tt>-p <i>samples</i></tt> @@ -66,7 +66,7 @@ <h4>Diagnostics</h4> <tt>ntpdate</tt>'s exit status is zero if it finds a server and updates the clock, and nonzero otherwise. <h4>Files</h4> - <tt>/etc/ntp.keys</tt> - encryption keys used by <tt>ntpdate</tt>. + <tt>/etc/ntp/keys</tt> - encryption keys used by <tt>ntpdate</tt>. <h4>Bugs</h4> The slew adjustment is actually 50% larger than the measured offset, since this (it is argued) will tend to keep a badly drifting clock more accurate. This is probably not a good idea and may cause a troubling hunt for some values of the kernel variables <tt>tick</tt> and <tt>tickadj</tt>. <hr> diff -up ntp-4.2.6p4/html/ntpdc.html.htmldoc ntp-4.2.6p4/html/ntpdc.html diff -up ntp-4.2.6p4/html/ntpq.html.htmldoc ntp-4.2.6p4/html/ntpq.html
