diff -up ntp-4.2.6p5/html/authopt.html.htmldoc ntp-4.2.6p5/html/authopt.html
--- ntp-4.2.6p5/html/authopt.html.htmldoc 2011-07-11 04:18:25.000000000 +0200
+++ ntp-4.2.6p5/html/authopt.html 2013-03-28 18:04:38.581260191 +0100
@@ -364,7 +364,7 @@ UTC
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 keysdir configuration
- command or default /usr/local/etc. Following are the options.
+ command or default /etc/ntp/crypto. Following are the options.
@@ -396,7 +396,7 @@ UTC
- Specifies the complete path to the MD5 key file containing the keys and key IDs used by ntpd, ntpq and ntpdc when operating with symmetric key cryptography. This is the same operation as the -k command line option. Note that the directory path for Autokey media is specified by the keysdir command.
- keysdir pathK
-- This command specifies the default directory path for Autokey cryptographic keys, parameters and certificates. The default is /usr/local/etc/. Note that the path for the symmetric keys file is specified by the keys command.
+- This command specifies the default directory path for Autokey cryptographic keys, parameters and certificates. The default is /etc/ntp/crypto. Note that the path for the symmetric keys file is specified by the keys command.
- requestkey keyid
- Specifies the key ID to use with the
diff -up ntp-4.2.6p5/html/keygen.html.htmldoc ntp-4.2.6p5/html/keygen.html
--- ntp-4.2.6p5/html/keygen.html.htmldoc 2011-07-11 04:18:26.000000000 +0200
+++ ntp-4.2.6p5/html/keygen.html 2013-03-28 18:04:38.581260191 +0100
@@ -206,7 +206,6 @@
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 ssh, 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 .rnd, which must be available when starting the ntp-keygen program or ntpd daemon.
The OpenSSL library looks for the file using the path specified by the RANDFILE environment variable in the user home directory, whether root or some other user. If the RANDFILE environment variable is not present, the library looks for the .rnd file in the user home directory. Since both the ntp-keygen program and ntpd daemon must run as root, the logical place to put this file is in /.rnd or /root/.rnd. If the file is not available or cannot be written, the program exits with a message to the system log.
-On systems that provide /dev/urandom, the randomness device is used instead and the file specified by the randfile subcommand or the RANDFILE environment variable is ignored.
Cryptographic Data Files
diff -up ntp-4.2.6p5/html/ntpd.html.htmldoc ntp-4.2.6p5/html/ntpd.html
--- ntp-4.2.6p5/html/ntpd.html.htmldoc 2011-07-11 04:18:26.000000000 +0200
+++ ntp-4.2.6p5/html/ntpd.html 2013-03-28 18:05:21.174228349 +0100
@@ -143,26 +143,8 @@
- Specify a user, and optionally a group, to switch to. This option is only available if the OS supports running the server without full root privileges. Currently, this option is supported under NetBSD (configure with --enable-clockctl) and Linux (configure with --enable-linuxcaps).
- -U interface update interval
- Number of seconds to wait between interface list scans to pick up new and delete network interface. Set to 0 to disable dynamic interface list updating. The default is to scan every 5 minutes.
- - -v variable
- - -V variable
- - Add a system variable listed by default.
- -x
- Normally, the time is slewed if the offset is less than the step threshold, which is 128 ms by default, and stepped if above the threshold. This option sets the threshold to 600 s, which is well within the accuracy window to set the clock manually. Note: Since the slew rate of typical Unix kernels is limited to 0.5 ms/s, each second of adjustment requires an amortization interval of 2000 s. Thus, an adjustment as much as 600 s will take almost 14 days to complete. This option can be used with the -g and -q options. See the tinker command for other options. Note: The kernel time discipline is disabled with this option.
- - --pccfreq frequency
- - Substitute processor cycle counter for QueryPerformanceCounter unconditionally
- using the given frequency (in Hz). --pccfreq can be used on systems
- which do not use the PCC to implement QueryPerformanceCounter
- and have a fixed PCC frequency. The frequency specified must
- be accurate within 0.5 percent. --usepcc is equivalent on many systems and should
- be tried first, as it does not require determining the frequency
- of the processor cycle counter. For x86-compatible processors, the PCC is
- also referred to as RDTSC, which is the assembly-language instruction to retrieve
- the current value. (Windows only)
- - --usepcc
- - Substitute processor cycle counter for QueryPerformanceCounter if they
- appear equivalent. This option should be used only if the PCC
- frequency is fixed. Power-saving functionality on many laptops varies the
- PCC frequency. (Windows only)
The Configuration File
Ordinarily, ntpd reads the ntp.conf configuration file at startup in order to determine the synchronization sources and operating modes. It is also possible to specify a working, although limited, configuration entirely on the command line, obviating the need for a configuration file. This may be particularly useful when the local host is to be configured as a broadcast client, with servers determined by listening to broadcasts at run time.
@@ -214,14 +196,14 @@
statistics path |
- /var/NTP |
+ /var/log/ntpstats/ |
-s |
statsdir |
keys path |
- /usr/local/etc |
- -k |
+ /etc/ntp/crypto |
+ none |
keysdir |
diff -up ntp-4.2.6p5/html/ntpdate.html.htmldoc ntp-4.2.6p5/html/ntpdate.html
--- ntp-4.2.6p5/html/ntpdate.html.htmldoc 2013-03-28 18:04:38.556260210 +0100
+++ ntp-4.2.6p5/html/ntpdate.html 2013-03-28 18:04:38.582260190 +0100
@@ -43,7 +43,7 @@
-e authdelay
Specify the processing delay to perform an authentication function as the value authdelay, in seconds and fraction (see ntpd 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.
-k keyfile
- Specify the path for the authentication key file as the string keyfile. The default is /etc/ntp.keys. This file should be in the format described in ntpd.
+ Specify the path for the authentication key file as the string keyfile. The default is /etc/ntp/keys. This file should be in the format described in ntpd.
-o version
Specify the NTP version for outgoing packets as the integer version, which can be 1 or 2. The default is 4. This allows ntpdate to be used with older NTP versions.
-p samples
@@ -66,7 +66,7 @@
Diagnostics
ntpdate's exit status is zero if it finds a server and updates the clock, and nonzero otherwise.
Files
- /etc/ntp.keys - encryption keys used by ntpdate.
+ /etc/ntp/keys - encryption keys used by ntpdate.
Bugs
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 tick and tickadj.
diff -up ntp-4.2.6p5/html/ntptime.html.htmldoc ntp-4.2.6p5/html/ntptime.html
--- ntp-4.2.6p5/html/ntptime.html.htmldoc 2009-12-09 08:36:36.000000000 +0100
+++ ntp-4.2.6p5/html/ntptime.html 2013-03-28 18:13:56.921842773 +0100
@@ -17,7 +17,7 @@
Synopsis
- ntptime [ -chr ] [ -e est_error ] [ -f frequency ] [ -m max_error ] [ -o offset ] [ -s status ] [ -t time_constant]
+ ntptime [ -MNchr ] [ -e est_error ] [ -f frequency ] [ -m max_error ] [ -o offset ] [ -s status ] [ -t time_constant] [ -T tai_offset ]
Description
This program is useful only with special kernels described in the A Kernel Model for Precision Timekeeping page. It reads and displays time-related kernel variables using the ntp_gettime() system call. A similar display can be obtained using the ntpdc program and kerninfo command.
Options
@@ -40,9 +40,15 @@
Specify clock status. Better know what you are doing.
-t time_constant
Specify time constant, an integer in the range 0-10.
+ -M
+ Switch to microsecond mode.
+ -N
+ Switch to nanosecond mode.
+ -T tai_offset
+ Set TAI offset.