From: Harlan Stenn Date: Sun, 6 Jan 2013 11:47:57 +0000 (+0000) Subject: NTP_4_2_7P346 X-Git-Tag: NTP_4_2_7P346^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7df0d5bbc92a42348c234042e86a01fbb481e11d;p=thirdparty%2Fntp.git NTP_4_2_7P346 bk: 50e9646dM9URi2DiHaau8cf5NTcdqw --- diff --git a/ChangeLog b/ChangeLog index 27ecba740..c383ae6c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p346) 2013/01/06 Released by Harlan Stenn * [Bug 1223] reorganize inclusion of sys/resource.h. (4.2.7p345) 2013/01/04 Released by Harlan Stenn * Update several .def files to use autogen-5.17 feature set. diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 4b12faa36..4da19f723 100644 --- a/ntpd/invoke-ntp.conf.texi +++ b/ntpd/invoke-ntp.conf.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi) # -# It has been AutoGen-ed January 4, 2013 at 09:03:01 AM by AutoGen 5.17.1pre11 +# It has been AutoGen-ed January 6, 2013 at 06:44:00 AM by AutoGen 5.17.1pre14 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index f5ad52a0a..ab93d27b0 100644 --- a/ntpd/invoke-ntp.keys.texi +++ b/ntpd/invoke-ntp.keys.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.keys.texi) # -# It has been AutoGen-ed January 4, 2013 at 09:03:03 AM by AutoGen 5.17.1pre11 +# It has been AutoGen-ed January 6, 2013 at 06:44:03 AM by AutoGen 5.17.1pre14 # From the definitions ntp.keys.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index bedacbb1d..581bab8b7 100644 --- a/ntpd/invoke-ntpd.texi +++ b/ntpd/invoke-ntpd.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpd.texi) # -# It has been AutoGen-ed January 4, 2013 at 09:03:04 AM by AutoGen 5.17.1pre11 +# It has been AutoGen-ed January 6, 2013 at 06:44:04 AM by AutoGen 5.17.1pre14 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -141,7 +141,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p345 +ntpd - NTP daemon program - Ver. 4.2.7p346 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description @@ -698,480 +698,11 @@ The operation failed or the command syntax was not valid. @end table @node ntpd Usage @subsection ntpd Usage -@node How NTP Operates -@section How NTP Operates - - -The -@code{ntpd} -utility operates by exchanging messages with -one or more configured servers over a range of designated poll intervals. -When -started, whether for the first or subsequent times, the program -requires several exchanges from the majority of these servers so -the signal processing and mitigation algorithms can accumulate and -groom the data and set the clock. -In order to protect the network -from bursts, the initial poll interval for each server is delayed -an interval randomized over a few seconds. -At the default initial poll -interval of 64s, several minutes can elapse before the clock is -set. -This initial delay to set the clock -can be safely and dramatically reduced using the -@code{iburst} -keyword with the -@code{server} -configuration -command, as described in -@code{ntp.conf(5)}. - -Most operating systems and hardware of today incorporate a -time-of-year (TOY) chip to maintain the time during periods when -the power is off. -When the machine is booted, the chip is used to -initialize the operating system time. -After the machine has -synchronized to a NTP server, the operating system corrects the -chip from time to time. -In the default case, if -@code{ntpd} -detects that the time on the host -is more than 1000s from the server time, -@code{ntpd} -assumes something must be terribly wrong and the only -reliable action is for the operator to intervene and set the clock -by hand. -(Reasons for this include there is no TOY chip, -or its battery is dead, or that the TOY chip is just of poor quality.) -This causes -@code{ntpd} -to exit with a panic message to -the system log. -The -@code{-g} -option overrides this check and the -clock will be set to the server time regardless of the chip time -(up to 68 years in the past or future \(em -this is a limitation of the NTPv4 protocol). -However, and to protect against broken hardware, such as when the -CMOS battery fails or the clock counter becomes defective, once the -clock has been set an error greater than 1000s will cause -@code{ntpd} -to exit anyway. - -Under ordinary conditions, -@code{ntpd} -adjusts the clock in -small steps so that the timescale is effectively continuous and -without discontinuities. -Under conditions of extreme network -congestion, the roundtrip delay jitter can exceed three seconds and -the synchronization distance, which is equal to one-half the -roundtrip delay plus error budget terms, can become very large. -The -@code{ntpd} -algorithms discard sample offsets exceeding 128 ms, -unless the interval during which no sample offset is less than 128 -ms exceeds 900s. -The first sample after that, no matter what the -offset, steps the clock to the indicated time. -In practice this -reduces the false alarm rate where the clock is stepped in error to -a vanishingly low incidence. - -As the result of this behavior, once the clock has been set it -very rarely strays more than 128 ms even under extreme cases of -network path congestion and jitter. -Sometimes, in particular when -@code{ntpd} -is first started without a valid drift file -on a system with a large intrinsic drift -the error might grow to exceed 128 ms, -which would cause the clock to be set backwards -if the local clock time is more than 128 s -in the future relative to the server. -In some applications, this behavior may be unacceptable. -There are several solutions, however. -If the -@code{-x} -option is included on the command line, the clock will -never be stepped and only slew corrections will be used. -But this choice comes with a cost that -should be carefully explored before deciding to use -the -@code{-x} -option. -The maximum slew rate possible is limited -to 500 parts-per-million (PPM) as a consequence of the correctness -principles on which the NTP protocol and algorithm design are -based. -As a result, the local clock can take a long time to -converge to an acceptable offset, about 2,000 s for each second the -clock is outside the acceptable range. -During this interval the -local clock will not be consistent with any other network clock and -the system cannot be used for distributed applications that require -correctly synchronized network time. - -In spite of the above precautions, sometimes when large -frequency errors are present the resulting time offsets stray -outside the 128-ms range and an eventual step or slew time -correction is required. -If following such a correction the -frequency error is so large that the first sample is outside the -acceptable range, -@code{ntpd} -enters the same state as when the -@file{ntp.drift} -file is not present. -The intent of this behavior -is to quickly correct the frequency and restore operation to the -normal tracking mode. -In the most extreme cases -(the host -@code{time.ien.it} -comes to mind), there may be occasional -step/slew corrections and subsequent frequency corrections. -It -helps in these cases to use the -@code{burst} -keyword when -configuring the server, but -ONLY -when you have permission to do so from the owner of the target host. - -Finally, -in the past many startup scripts would run -@code{ntpdate(8)} -to get the system clock close to correct before starting -@code{ntpd(8)}, -but this was never more than a mediocre hack and is no longer needed. - -There is a way to start -@code{ntpd(8)} -that often addresses all of the problems mentioned above. -@node Starting NTP (Best Current Practice) -@section Starting NTP (Best Current Practice) - - -First, use the -@code{iburst} -option on your -@code{server} -entries. - -If you can also keep a good -@file{ntp.drift} -file then -@code{ntpd(8)} -will effectively "warm-start" and your system's clock will -be stable in under 11 seconds' time. - -As soon as possible in the startup sequence, start -@code{ntpd(8)} -with at least the -@code{-g} -and perhaps the -@code{-N} -options. -Then, -start the rest of your "normal" processes. -This will give -@code{ntpd(8)} -as much time as possible to get the system's clock synchronized and stable. - -Finally, -if you have processes like -@code{dovecot} -or database servers -that require -monotonically-increasing time, -run -@code{ntp-wait(8)} -as late as possible in the boot sequence -(perhaps with the -@code{-v} -flag) -and after -@code{ntp-wait(8)} -exits successfully -it is as safe as it will ever be to start any process that require -stable time. -@node Frequency Discipline -@section Frequency Discipline - - -The -@code{ntpd} -behavior at startup depends on whether the -frequency file, usually -@file{ntp.drift}, -exists. -This file -contains the latest estimate of clock frequency error. -When the -@code{ntpd} -is started and the file does not exist, the -@code{ntpd} -enters a special mode designed to quickly adapt to -the particular system clock oscillator time and frequency error. -This takes approximately 15 minutes, after which the time and -frequency are set to nominal values and the -@code{ntpd} -enters -normal mode, where the time and frequency are continuously tracked -relative to the server. -After one hour the frequency file is -created and the current frequency offset written to it. -When the -@code{ntpd} -is started and the file does exist, the -@code{ntpd} -frequency is initialized from the file and enters normal mode -immediately. -After that the current frequency offset is written to -the file at hourly intervals. -@node Operating Modes -@section Operating Modes - - -The -@code{ntpd} -utility can operate in any of several modes, including -symmetric active/passive, client/server broadcast/multicast and -manycast, as described in the -"Association Management" -page -(available as part of the HTML documentation -provided in -@file{/usr/share/doc/ntp}). -It normally operates continuously while -monitoring for small changes in frequency and trimming the clock -for the ultimate precision. -However, it can operate in a one-time -mode where the time is set from an external server and frequency is -set from a previously recorded frequency file. -A -broadcast/multicast or manycast client can discover remote servers, -compute server-client propagation delay correction factors and -configure itself automatically. -This makes it possible to deploy a -fleet of workstations without specifying configuration details -specific to the local environment. - -By default, -@code{ntpd} -runs in continuous mode where each of -possibly several external servers is polled at intervals determined -by an intricate state machine. -The state machine measures the -incidental roundtrip delay jitter and oscillator frequency wander -and determines the best poll interval using a heuristic algorithm. -Ordinarily, and in most operating environments, the state machine -will start with 64s intervals and eventually increase in steps to -1024s. -A small amount of random variation is introduced in order to -avoid bunching at the servers. -In addition, should a server become -unreachable for some time, the poll interval is increased in steps -to 1024s in order to reduce network overhead. - -In some cases it may not be practical for -@code{ntpd} -to run -continuously. -A common workaround has been to run the -@code{ntpdate(8)} -program from a -@code{cron(8)} -job at designated -times. -However, this program does not have the crafted signal -processing, error checking and mitigation algorithms of -@code{ntpd}. -The -@code{-q} -option is intended for this purpose. -Setting this option will cause -@code{ntpd} -to exit just after -setting the clock for the first time. -The procedure for initially -setting the clock is the same as in continuous mode; most -applications will probably want to specify the -@code{iburst} -keyword with the -@code{server} -configuration command. -With this -keyword a volley of messages are exchanged to groom the data and -the clock is set in about 10 s. -If nothing is heard after a -couple of minutes, the daemon times out and exits. -After a suitable -period of mourning, the -@code{ntpdate(8)} -program may be -retired. - -When kernel support is available to discipline the clock -frequency, which is the case for stock Solaris, Tru64, Linux and -Fx, -a useful feature is available to discipline the clock -frequency. -First, -@code{ntpd} -is run in continuous mode with -selected servers in order to measure and record the intrinsic clock -frequency offset in the frequency file. -It may take some hours for -the frequency and offset to settle down. -Then the -@code{ntpd} -is -stopped and run in one-time mode as required. -At each startup, the -frequency is read from the file and initializes the kernel -frequency. -@node Poll Interval Control -@section Poll Interval Control - - -This version of NTP includes an intricate state machine to -reduce the network load while maintaining a quality of -synchronization consistent with the observed jitter and wander. -There are a number of ways to tailor the operation in order enhance -accuracy by reducing the interval or to reduce network overhead by -increasing it. -However, the user is advised to carefully consider -the consequences of changing the poll adjustment range from the -default minimum of 64 s to the default maximum of 1,024 s. -The -default minimum can be changed with the -@code{tinker} -@code{minpoll} -command to a value not less than 16 s. -This value is used for all -configured associations, unless overridden by the -@code{minpoll} -option on the configuration command. -Note that most device drivers -will not operate properly if the poll interval is less than 64 s -and that the broadcast server and manycast client associations will -also use the default, unless overridden. - -In some cases involving dial up or toll services, it may be -useful to increase the minimum interval to a few tens of minutes -and maximum interval to a day or so. -Under normal operation -conditions, once the clock discipline loop has stabilized the -interval will be increased in steps from the minimum to the -maximum. -However, this assumes the intrinsic clock frequency error -is small enough for the discipline loop correct it. -The capture -range of the loop is 500 PPM at an interval of 64s decreasing by a -factor of two for each doubling of interval. -At a minimum of 1,024 -s, for example, the capture range is only 31 PPM. -If the intrinsic -error is greater than this, the drift file -@file{ntp.drift} -will -have to be specially tailored to reduce the residual error below -this limit. -Once this is done, the drift file is automatically -updated once per hour and is available to initialize the frequency -on subsequent daemon restarts. -@node The huff-n'-puff Filter -@section The huff-n'-puff Filter - - -In scenarios where a considerable amount of data are to be -downloaded or uploaded over telephone modems, timekeeping quality -can be seriously degraded. -This occurs because the differential -delays on the two directions of transmission can be quite large. -In -many cases the apparent time errors are so large as to exceed the -step threshold and a step correction can occur during and after the -data transfer is in progress. - -The huff-n'-puff filter is designed to correct the apparent time -offset in these cases. -It depends on knowledge of the propagation -delay when no other traffic is present. -In common scenarios this -occurs during other than work hours. -The filter maintains a shift -register that remembers the minimum delay over the most recent -interval measured usually in hours. -Under conditions of severe -delay, the filter corrects the apparent offset using the sign of -the offset and the difference between the apparent delay and -minimum delay. -The name of the filter reflects the negative (huff) -and positive (puff) correction, which depends on the sign of the -offset. - -The filter is activated by the -@code{tinker} -command and -@code{huffpuff} -keyword, as described in -@code{ntp.conf(5)}. @node ntpd Files @subsection ntpd Files -@table @asis - -@item @file{/etc/ntp.conf} -the default name of the configuration file -@item @file{/etc/ntp.drift} -the default name of the drift file -@item @file{/etc/ntp.keys} -the default name of the key file -@end table @node ntpd See Also @subsection ntpd See Also -@code{ntp.conf(5)}, -@code{ntpdate(8)}, -@code{ntpdc(8)}, -@code{ntpq(8)} - -In addition to the manual pages provided, -comprehensive documentation is available on the world wide web -at -@code{http://www.ntp.org/}. -A snapshot of this documentation is available in HTML format in -@file{/usr/share/doc/ntp}. -@* - David L. Mills, @emph{Network Time Protocol (Version 1)}, RFC1059. -@* - David L. Mills, @emph{Network Time Protocol (Version 2)}, RFC1119. -@* - David L. Mills, @emph{Network Time Protocol (Version 3)}, RFC1305. -@* - David L. Mills, J. Martin, Ed., J. Burbank, W. Kasch, @emph{Network Time Protocol Version 4: Protocol and Algorithms Specification}, RFC5905. -@* - David L. Mills, B. Haberman, Ed., @emph{Network Time Protocol Version 4: Autokey Specification}, RFC5906. -@* - H. Gerstung, C. Elliott, B. Haberman, Ed., @emph{Definitions of Managed Objects for Network Time Protocol Version 4: (NTPv4)}, RFC5907. -@* - R. Gayraud, B. Lourdelet, @emph{Network Time Protocol (NTP) Server Option for DHCPv6}, RFC5908. @node ntpd Bugs @subsection ntpd Bugs -The -@code{ntpd} -utility has gotten rather fat. -While not huge, it has gotten -larger than might be desirable for an elevated-priority -@code{ntpd} -running on a workstation, particularly since many of -the fancy features which consume the space were designed more with -a busy primary server, rather than a high stratum workstation in -mind. @node ntpd Notes @subsection ntpd Notes -This document corresponds to version 4.2.7p345 of NTP. -Portions of this document came from FreeBSD. diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 7d9eede4b..2881a523b 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -1,8 +1,8 @@ -.TH ntp.conf 5man "04 Jan 2013" "4.2.7p345" "File Formats" +.TH ntp.conf 5man "06 Jan 2013" "4.2.7p346" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 4, 2013 at 09:02:47 AM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 6, 2013 at 06:43:46 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" @@ -2950,9 +2950,12 @@ The files are really digital certificates. These should be obtained via secure directory -services when they become universally available.Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org +services when they become universally available. +.PP +Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p345 of NTP. -This document was derived from FreeBSD..Pp +This document corresponds to version 4.2.7p346 of NTP. +This document was derived from FreeBSD. +.PP This manual page was \fIAutoGen\fP-erated from the \fBntp.conf\fP option definitions. diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 40ee65c70..76a449110 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd January 4 2013 +.Dd January 6 2013 .Dt NTP_CONF 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 4, 2013 at 09:03:06 AM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 6, 2013 at 06:44:07 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2781,9 +2781,12 @@ The files are really digital certificates. These should be obtained via secure directory -services when they become universally available.Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org +services when they become universally available. +.Pp +Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p345 of NTP. -This document was derived from FreeBSD..Pp +This document corresponds to version 4.2.7p346 of NTP. +This document was derived from FreeBSD. +.Pp This manual page was \fIAutoGen\fP\-erated from the \fBntp.conf\fP option definitions. diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index 09b3e38bd..4c451cde7 100644 --- a/ntpd/ntp.conf.html +++ b/ntpd/ntp.conf.html @@ -33,7 +33,7 @@ Up: (dir)

This document describes the configuration file for the NTP Project's ntpd program. -

This document applies to version 4.2.7p345 of ntp.conf. +

This document applies to version 4.2.7p346 of ntp.conf.

  • ntp.conf Description diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 9ad6f5f7c..67444fc75 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -1,8 +1,8 @@ -.TH ntp.conf 5 "04 Jan 2013" "4.2.7p345" "File Formats" +.TH ntp.conf 5 "06 Jan 2013" "4.2.7p346" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 4, 2013 at 09:02:47 AM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 6, 2013 at 06:43:46 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" @@ -2950,9 +2950,12 @@ The files are really digital certificates. These should be obtained via secure directory -services when they become universally available.Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org +services when they become universally available. +.PP +Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p345 of NTP. -This document was derived from FreeBSD..Pp +This document corresponds to version 4.2.7p346 of NTP. +This document was derived from FreeBSD. +.PP This manual page was \fIAutoGen\fP-erated from the \fBntp.conf\fP option definitions. diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 20c483dbc..252379b50 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 4 2013 +.Dd January 6 2013 .Dt NTP_CONF 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 4, 2013 at 09:03:06 AM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 6, 2013 at 06:44:07 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2781,9 +2781,12 @@ The files are really digital certificates. These should be obtained via secure directory -services when they become universally available.Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org +services when they become universally available. +.Pp +Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p345 of NTP. -This document was derived from FreeBSD..Pp +This document corresponds to version 4.2.7p346 of NTP. +This document was derived from FreeBSD. +.Pp This manual page was \fIAutoGen\fP\-erated from the \fBntp.conf\fP option definitions. diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index 4feb3eede..87fad1ba0 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "04 Jan 2013" "4.2.7p345" "File Formats" +.TH ntp.keys 5man "06 Jan 2013" "4.2.7p346" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 4, 2013 at 09:02:52 AM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 6, 2013 at 06:43:52 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .\" @@ -133,7 +133,8 @@ This program is released under the terms of the NTP license, (dir)

    This document describes the symmetric key file for the NTP Project's ntpd program. -

    This document applies to version 4.2.7p345 of ntp.keys. +

    This document applies to version 4.2.7p346 of ntp.keys.

    Short Contents

    @@ -194,7 +194,7 @@ Up: ntp.keys Notes

    ntp.keys Notes

    -

    This document corresponds to version of NTP. +

    This document corresponds to version #VERSION# of NTP. This document was derived from FreeBSD. diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index fb24bac78..8faa1b2e7 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "04 Jan 2013" "4.2.7p345" "File Formats" +.TH ntp.keys 5 "06 Jan 2013" "4.2.7p346" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 4, 2013 at 09:02:52 AM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 6, 2013 at 06:43:52 AM by AutoGen 5.17.1pre14 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .\" @@ -133,7 +133,8 @@ This program is released under the terms of the NTP license, [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 2935 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2969 */ "\n\n\0" -/* 2972 */ "ntpd 4.2.7p345"; +/* 2972 */ "ntpd 4.2.7p346"; /* * ipv4 option description with diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index f9dfb1b0b..adfe5e4dd 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed January 4, 2013 at 09:01:38 AM by AutoGen 5.17.1pre11 + * It has been AutoGen-ed January 6, 2013 at 05:41:24 AM by AutoGen 5.17.1pre14 * From the definitions ntpd-opts.def * and the template file options * - * Generated from AutoOpts 37:0:12 templates. + * Generated from AutoOpts 37:1:12 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -53,7 +53,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 151552 +#define AO_TEMPLATE_VERSION 151553 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -104,8 +104,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 37 -#define NTPD_VERSION "4.2.7p345" -#define NTPD_FULL_VERSION "ntpd 4.2.7p345" +#define NTPD_VERSION "4.2.7p346" +#define NTPD_FULL_VERSION "ntpd 4.2.7p346" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index b7d23b6a0..a55d624c6 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -1,8 +1,8 @@ -.TH ntpd 1ntpdman "04 Jan 2013" "4.2.7p345" "User Commands" +.TH ntpd 1ntpdman "06 Jan 2013" "4.2.7p346" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed January 4, 2013 at 09:02:55 AM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 6, 2013 at 06:43:55 AM by AutoGen 5.17.1pre14 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" @@ -924,9 +924,12 @@ larger than might be desirable for an elevated-priority running on a workstation, particularly since many of the fancy features which consume the space were designed more with a busy primary server, rather than a high stratum workstation in -mind.Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org +mind. +.PP +Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p345 of NTP. -Portions of this document came from FreeBSD..Pp +This document corresponds to version 4.2.7p346 of NTP. +Portions of this document came from FreeBSD. +.PP This manual page was \fIAutoGen\fP-erated from the \fBntpd\fP option definitions. diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index 555ac82ba..c3d6b415e 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd January 4 2013 +.Dd January 6 2013 .Dt NTPD 1ntpdmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed January 4, 2013 at 09:03:12 AM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 6, 2013 at 06:44:12 AM by AutoGen 5.17.1pre14 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -891,9 +891,12 @@ larger than might be desirable for an elevated\-priority running on a workstation, particularly since many of the fancy features which consume the space were designed more with a busy primary server, rather than a high stratum workstation in -mind.Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org +mind. +.Pp +Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p345 of NTP. -Portions of this document came from FreeBSD..Pp +This document corresponds to version 4.2.7p346 of NTP. +Portions of this document came from FreeBSD. +.Pp This manual page was \fIAutoGen\fP\-erated from the \fBntpd\fP option definitions. diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html index 13761536c..3b0b9a507 100644 --- a/ntpd/ntpd.html +++ b/ntpd/ntpd.html @@ -39,7 +39,7 @@ The program can operate in any of several modes, including client/server, symmetric and broadcast modes, and with both symmetric-key and public-key cryptography. -

    This document applies to version 4.2.7p345 of ntpd. +

    This document applies to version 4.2.7p346 of ntpd.

    • ntpd Description: Description @@ -219,7 +219,7 @@ the usage text by passing it through a pager program. used to select the program, defaulting to more. Both will exit with a status code of 0. -
      ntpd - NTP daemon program - Ver. 4.2.7p344
+
      ntpd - NTP daemon program - Ver. 4.2.7p345
 USAGE:  ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
@@ -917,8 +917,8 @@ values are treated like option arguments.
 
 
      Print the program version to standard out, optionally with licensing
 information, then exit 0.  The optional argument specifies how much licensing
-detail to provide.  The default is to print just the version.  The licensing infomation may be selected with an option argument.  Only the
-first letter of the argument is examined:
+detail to provide.  The default is to print just the version.  The licensing infomation may be selected with an option argument. 
+Only the first letter of the argument is examined:
 
      
      
 
      version
      Only print the version.  This is the default. 
@@ -1477,7 +1477,7 @@ Up: ntpd Invocation
 
 
      ntpd Notes
      
 
-
      This document corresponds to version  of NTP. 
+
      This document corresponds to version 4.2.7p345 of NTP. 
 Portions of this document came from FreeBSD.
 
 
      
diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index b2181cdd6..2949e5926 100644
--- a/ntpd/ntpd.man.in
+++ b/ntpd/ntpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpd @NTPD_MS@ "04 Jan 2013" "4.2.7p345" "User Commands"
+.TH ntpd @NTPD_MS@ "06 Jan 2013" "4.2.7p346" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  4, 2013 at 09:02:55 AM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  6, 2013 at 06:43:55 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -924,9 +924,12 @@ larger than might be desirable for an elevated-priority
 running on a workstation, particularly since many of
 the fancy features which consume the space were designed more with
 a busy primary server, rather than a high stratum workstation in
-mind.Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
+mind.
+.PP
+Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p345 of NTP.
-Portions of this document came from FreeBSD..Pp
+This document corresponds to version 4.2.7p346 of NTP.
+Portions of this document came from FreeBSD.
+.PP
 This manual page was \fIAutoGen\fP-erated from the \fBntpd\fP
 option definitions.
diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in
index d57cd40ba..581696980 100644
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 4 2013
+.Dd January 6 2013
 .Dt NTPD @NTPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  4, 2013 at 09:03:12 AM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  6, 2013 at 06:44:12 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -891,9 +891,12 @@ larger than might be desirable for an elevated\-priority
 running on a workstation, particularly since many of
 the fancy features which consume the space were designed more with
 a busy primary server, rather than a high stratum workstation in
-mind.Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
+mind.
+.Pp
+Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p345 of NTP.
-Portions of this document came from FreeBSD..Pp
+This document corresponds to version 4.2.7p346 of NTP.
+Portions of this document came from FreeBSD.
+.Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntpd\fP
 option definitions.
diff --git a/ntpdc/invoke-ntpdc.texi b/ntpdc/invoke-ntpdc.texi
index 34cc28940..b61d0d146 100644
--- a/ntpdc/invoke-ntpdc.texi
+++ b/ntpdc/invoke-ntpdc.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpdc.texi)
 # 
-# It has been AutoGen-ed  January  4, 2013 at 09:03:32 AM by AutoGen 5.17.1pre11
+# It has been AutoGen-ed  January  6, 2013 at 06:44:36 AM by AutoGen 5.17.1pre14
 # From the definitions    ntpdc-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -69,7 +69,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p345
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p346
 USAGE:  ntpdc [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -341,616 +341,9 @@ it to autogen-users@@lists.sourceforge.net.  Thank you.
 @end table
 @node ntpdc Usage
 @subsection ntpdc Usage
-If one or more request options are included on the command line
-when
-@code{ntpdc}
-is executed, each of the requests will be sent
-to the NTP servers running on each of the hosts given as command
-line arguments, or on localhost by default.
-If no request options
-are given,
-@code{ntpdc}
-will attempt to read commands from the
-standard input and execute these on the NTP server running on the
-first host given on the command line, again defaulting to localhost
-when no other host is specified.
-The
-@code{ntpdc}
-utility will prompt for
-commands if the standard input is a terminal device.
-
-The
-@code{ntpdc}
-utility uses NTP mode 7 packets to communicate with the
-NTP server, and hence can be used to query any compatible server on
-the network which permits it.
-Note that since NTP is a UDP protocol
-this communication will be somewhat unreliable, especially over
-large distances in terms of network topology.
-The
-@code{ntpdc}
-utility makes
-no attempt to retransmit requests, and will time requests out if
-the remote host is not heard from within a suitable timeout
-time.
-
-The operation of
-@code{ntpdc}
-are specific to the particular
-implementation of the
-@code{ntpd(8)}
-daemon and can be expected to
-work only with this and maybe some previous versions of the daemon.
-Requests from a remote
-@code{ntpdc}
-utility which affect the
-state of the local server must be authenticated, which requires
-both the remote program and local server share a common key and key
-identifier.
-
-Note that in contexts where a host name is expected, a
-@code{-4}
-qualifier preceding the host name forces DNS resolution to the IPv4 namespace,
-while a
-@code{-6}
-qualifier forces DNS resolution to the IPv6 namespace.
-Specifying a command line option other than
-@code{-i}
-or
-@code{-n}
-will cause the specified query (queries) to be sent to
-the indicated host(s) immediately.
-Otherwise,
-@code{ntpdc}
-will
-attempt to read interactive format commands from the standard
-input.
-@node Interactive Commands
-@section Interactive Commands
-
-
-Interactive format commands consist of a keyword followed by zero
-to four arguments.
-Only enough characters of the full keyword to
-uniquely identify the command need be typed.
-The output of a
-command is normally sent to the standard output, but optionally the
-output of individual commands may be sent to a file by appending a
-@quoteleft{}>,@quoteright{}
-followed by a file name, to the command line.
-
-A number of interactive format commands are executed entirely
-within the
-@code{ntpdc}
-utility itself and do not result in NTP
-mode 7 requests being sent to a server.
-These are described
-following.
-@table @asis
-
-@item @code{?} @kbd{command_keyword}
-@item @code{help} @kbd{command_keyword}
-A
-@quoteleft{}@code{?}@quoteright{}
-will print a list of all the command
-keywords known to this incarnation of
-@code{ntpdc}.
-A
-@quoteleft{}@code{?}@quoteright{}
-followed by a command keyword will print function and usage
-information about the command.
-This command is probably a better
-source of information about
-@code{ntpq(8)}
-than this manual
-page.
-@item @code{delay} @kbd{milliseconds}
-Specify a time interval to be added to timestamps included in
-requests which require authentication.
-This is used to enable
-(unreliable) server reconfiguration over long delay network paths
-or between machines whose clocks are unsynchronized.
-Actually the
-server does not now require timestamps in authenticated requests,
-so this command may be obsolete.
-@item @code{host} @kbd{hostname}
-Set the host to which future queries will be sent.
-Hostname may
-be either a host name or a numeric address.
-@item @code{hostnames} [@code{yes} | @code{Cm} @code{no}]
-If
-@code{yes}
-is specified, host names are printed in
-information displays.
-If
-@code{no}
-is specified, numeric
-addresses are printed instead.
-The default is
-@code{yes},
-unless
-modified using the command line
-@code{-n}
-switch.
-@item @code{keyid} @kbd{keyid}
-This command allows the specification of a key number to be
-used to authenticate configuration requests.
-This must correspond
-to a key number the server has been configured to use for this
-purpose.
-@item @code{quit}
-Exit
-@code{ntpdc}.
-@item @code{passwd}
-This command prompts you to type in a password (which will not
-be echoed) which will be used to authenticate configuration
-requests.
-The password must correspond to the key configured for
-use by the NTP server for this purpose if such requests are to be
-successful.
-@item @code{timeout} @kbd{milliseconds}
-Specify a timeout period for responses to server queries.
-The
-default is about 8000 milliseconds.
-Note that since
-@code{ntpdc}
-retries each query once after a timeout, the total waiting time for
-a timeout will be twice the timeout value set.
-@end table
-@node Control Message Commands
-@section Control Message Commands
-
-
-Query commands result in NTP mode 7 packets containing requests for
-information being sent to the server.
-These are read-only commands
-in that they make no modification of the server configuration
-state.
-@table @asis
-
-@item @code{listpeers}
-Obtains and prints a brief list of the peers for which the
-server is maintaining state.
-These should include all configured
-peer associations as well as those peers whose stratum is such that
-they are considered by the server to be possible future
-synchronization candidates.
-@item @code{peers}
-Obtains a list of peers for which the server is maintaining
-state, along with a summary of that state.
-Summary information
-includes the address of the remote peer, the local interface
-address (0.0.0.0 if a local address has yet to be determined), the
-stratum of the remote peer (a stratum of 16 indicates the remote
-peer is unsynchronized), the polling interval, in seconds, the
-reachability register, in octal, and the current estimated delay,
-offset and dispersion of the peer, all in seconds.
-
-The character in the left margin indicates the mode this peer
-entry is operating in.
-A
-@quoteleft{}+@quoteright{}
-denotes symmetric active, a
-@quoteleft{}-@quoteright{}
-indicates symmetric passive, a
-@quoteleft{}=@quoteright{}
-means the
-remote server is being polled in client mode, a
-@quoteleft{}^@quoteright{}
-indicates that the server is broadcasting to this address, a
-@quoteleft{}~@quoteright{}
-denotes that the remote peer is sending broadcasts and a
-@quoteleft{}~@quoteright{}
-denotes that the remote peer is sending broadcasts and a
-@quoteleft{}*@quoteright{}
-marks the peer the server is currently synchronizing
-to.
-
-The contents of the host field may be one of four forms.
-It may
-be a host name, an IP address, a reference clock implementation
-name with its parameter or
-@code{REFCLK}(@emph{implementation_number}@code{,} @emph{parameter}).
-On
-@code{hostnames}
-@code{no}
-only IP-addresses
-will be displayed.
-@item @code{dmpeers}
-A slightly different peer summary list.
-Identical to the output
-of the
-@code{peers}
-command, except for the character in the
-leftmost column.
-Characters only appear beside peers which were
-included in the final stage of the clock selection algorithm.
-A
-@quoteleft{}.@quoteright{}
-indicates that this peer was cast off in the falseticker
-detection, while a
-@quoteleft{}+@quoteright{}
-indicates that the peer made it
-through.
-A
-@quoteleft{}*@quoteright{}
-denotes the peer the server is currently
-synchronizing with.
-@item @code{showpeer} @kbd{peer_address} @kbd{Oo} @kbd{...} @kbd{Oc}
-Shows a detailed display of the current peer variables for one
-or more peers.
-Most of these values are described in the NTP
-Version 2 specification.
-@item @code{pstats} @kbd{peer_address} @kbd{Oo} @kbd{...} @kbd{Oc}
-Show per-peer statistic counters associated with the specified
-peer(s).
-@item @code{clockinfo} @kbd{clock_peer_address} @kbd{Oo} @kbd{...} @kbd{Oc}
-Obtain and print information concerning a peer clock.
-The
-values obtained provide information on the setting of fudge factors
-and other clock performance information.
-@item @code{kerninfo}
-Obtain and print kernel phase-lock loop operating parameters.
-This information is available only if the kernel has been specially
-modified for a precision timekeeping function.
-@item @code{loopinfo} [@code{oneline} | @code{Cm} @code{multiline}]
-Print the values of selected loop filter variables.
-The loop
-filter is the part of NTP which deals with adjusting the local
-system clock.
-The
-@quoteleft{}offset@quoteright{}
-is the last offset given to the
-loop filter by the packet processing code.
-The
-@quoteleft{}frequency@quoteright{}
-is the frequency error of the local clock in parts-per-million
-(ppm).
-The
-@quoteleft{}time_const@quoteright{}
-controls the stiffness of the
-phase-lock loop and thus the speed at which it can adapt to
-oscillator drift.
-The
-@quoteleft{}watchdog timer@quoteright{}
-value is the number
-of seconds which have elapsed since the last sample offset was
-given to the loop filter.
-The
-@code{oneline}
-and
-@code{multiline}
-options specify the format in which this
-information is to be printed, with
-@code{multiline}
-as the
-default.
-@item @code{sysinfo}
-Print a variety of system state variables, i.e., state related
-to the local server.
-All except the last four lines are described
-in the NTP Version 3 specification, RFC-1305.
-
-The
-@quoteleft{}system flags@quoteright{}
-show various system flags, some of
-which can be set and cleared by the
-@code{enable}
-and
-@code{disable}
-configuration commands, respectively.
-These are
-the
-@code{auth},
-@code{bclient},
-@code{monitor},
-@code{pll},
-@code{pps}
-and
-@code{stats}
-flags.
-See the
-@code{ntpd(8)}
-documentation for the meaning of these flags.
-There
-are two additional flags which are read only, the
-@code{kernel_pll}
-and
-@code{kernel_pps}.
-These flags indicate
-the synchronization status when the precision time kernel
-modifications are in use.
-The
-@quoteleft{}kernel_pll@quoteright{}
-indicates that
-the local clock is being disciplined by the kernel, while the
-@quoteleft{}kernel_pps@quoteright{}
-indicates the kernel discipline is provided by the PPS
-signal.
-
-The
-@quoteleft{}stability@quoteright{}
-is the residual frequency error remaining
-after the system frequency correction is applied and is intended for
-maintenance and debugging.
-In most architectures, this value will
-initially decrease from as high as 500 ppm to a nominal value in
-the range .01 to 0.1 ppm.
-If it remains high for some time after
-starting the daemon, something may be wrong with the local clock,
-or the value of the kernel variable
-Va kern.clockrate.tick
-may be
-incorrect.
-
-The
-@quoteleft{}broadcastdelay@quoteright{}
-shows the default broadcast delay,
-as set by the
-@code{broadcastdelay}
-configuration command.
-
-The
-@quoteleft{}authdelay@quoteright{}
-shows the default authentication delay,
-as set by the
-@code{authdelay}
-configuration command.
-@item @code{sysstats}
-Print statistics counters maintained in the protocol
-module.
-@item @code{memstats}
-Print statistics counters related to memory allocation
-code.
-@item @code{iostats}
-Print statistics counters maintained in the input-output
-module.
-@item @code{timerstats}
-Print statistics counters maintained in the timer/event queue
-support code.
-@item @code{reslist}
-Obtain and print the server's restriction list.
-This list is
-(usually) printed in sorted order and may help to understand how
-the restrictions are applied.
-@item @code{monlist} [@kbd{version}]
-Obtain and print traffic counts collected and maintained by the
-monitor facility.
-The version number should not normally need to be
-specified.
-@item @code{clkbug} @kbd{clock_peer_address} @kbd{Oo} @kbd{...} @kbd{Oc}
-Obtain debugging information for a reference clock driver.
-This
-information is provided only by some clock drivers and is mostly
-undecodable without a copy of the driver source in hand.
-@end table
-@node Runtime Configuration Requests
-@section Runtime Configuration Requests
-
-
-All requests which cause state changes in the server are
-authenticated by the server using a configured NTP key (the
-facility can also be disabled by the server by not configuring a
-key).
-The key number and the corresponding key must also be made
-known to
-@code{ntpdc}.
-This can be done using the
-@code{keyid}
-and
-@code{passwd}
-commands, the latter of which will prompt at the terminal for a
-password to use as the encryption key.
-You will also be prompted
-automatically for both the key number and password the first time a
-command which would result in an authenticated request to the
-server is given.
-Authentication not only provides verification that
-the requester has permission to make such changes, but also gives
-an extra degree of protection again transmission errors.
-
-Authenticated requests always include a timestamp in the packet
-data, which is included in the computation of the authentication
-code.
-This timestamp is compared by the server to its receive time
-stamp.
-If they differ by more than a small amount the request is
-rejected.
-This is done for two reasons.
-First, it makes simple
-replay attacks on the server, by someone who might be able to
-overhear traffic on your LAN, much more difficult.
-Second, it makes
-it more difficult to request configuration changes to your server
-from topologically remote hosts.
-While the reconfiguration facility
-will work well with a server on the local host, and may work
-adequately between time-synchronized hosts on the same LAN, it will
-work very poorly for more distant hosts.
-As such, if reasonable
-passwords are chosen, care is taken in the distribution and
-protection of keys and appropriate source address restrictions are
-applied, the run time reconfiguration facility should provide an
-adequate level of security.
-
-The following commands all make authenticated requests.
-@table @asis
-
-@item @code{addpeer} @kbd{peer_address}[@kbd{keyid}][@kbd{version}][@code{prefer}]
-Add a configured peer association at the given address and
-operating in symmetric active mode.
-Note that an existing
-association with the same peer may be deleted when this command is
-executed, or may simply be converted to conform to the new
-configuration, as appropriate.
-If the optional
-@kbd{keyid}
-is a
-nonzero integer, all outgoing packets to the remote server will
-have an authentication field attached encrypted with this key.
-If
-the value is 0 (or not given) no authentication will be done.
-The
-@kbd{version}
-can be 1, 2 or 3 and defaults to 3.
-The
-@code{prefer}
-keyword indicates a preferred peer (and thus will
-be used primarily for clock synchronisation if possible).
-The
-preferred peer also determines the validity of the PPS signal - if
-the preferred peer is suitable for synchronisation so is the PPS
-signal.
-@item @code{addserver} @kbd{peer_address}[@kbd{keyid}][@kbd{version}][@code{prefer}]
-Identical to the addpeer command, except that the operating
-mode is client.
-@item @code{broadcast} @kbd{peer_address}[@kbd{keyid}][@kbd{version}][@code{prefer}]
-Identical to the addpeer command, except that the operating
-mode is broadcast.
-In this case a valid key identifier and key are
-required.
-The
-@kbd{peer_address}
-parameter can be the broadcast
-address of the local network or a multicast group address assigned
-to NTP.
-If a multicast address, a multicast-capable kernel is
-required.
-@item @code{unconfig} @kbd{peer_address} @kbd{Oo} @kbd{...} @kbd{Oc}
-This command causes the configured bit to be removed from the
-specified peer(s).
-In many cases this will cause the peer
-association to be deleted.
-When appropriate, however, the
-association may persist in an unconfigured mode if the remote peer
-is willing to continue on in this fashion.
-@item @code{fudge} @kbd{peer_address}[@code{time1}][@code{time2}][@kbd{stratum}][@kbd{refid}]
-This command provides a way to set certain data for a reference
-clock.
-See the source listing for further information.
-@item @code{enable}Oo@code{auth} | @code{Cm} @code{bclient} |@code{calibrate} | @code{Cm} @code{kernel} |@code{monitor} | @code{Cm} @code{ntp} |@code{pps} | @code{Cm} @code{stats}Oc
-@item @code{disable}Oo@code{auth} | @code{Cm} @code{bclient} |@code{calibrate} | @code{Cm} @code{kernel} |@code{monitor} | @code{Cm} @code{ntp} |@code{pps} | @code{Cm} @code{stats}Oc
-These commands operate in the same way as the
-@code{enable}
-and
-@code{disable}
-configuration file commands of
-@code{ntpd(8)}.
-@table @asis
-
-@item @code{auth}
-Enables the server to synchronize with unconfigured peers only
-if the peer has been correctly authenticated using either public key
-or private key cryptography.
-The default for this flag is enable.
-@item @code{bclient}
-Enables the server to listen for a message from a broadcast or
-multicast server, as in the multicastclient command with
-default address.
-The default for this flag is disable.
-@item @code{calibrate}
-Enables the calibrate feature for reference clocks.
-The default for this flag is disable.
-@item @code{kernel}
-Enables the kernel time discipline, if available.
-The default for this flag is enable if support is available, otherwise disable.
-@item @code{monitor}
-Enables the monitoring facility.
-See the
-@code{ntpdc(8)}.
-program and the monlist command or further information.
-The default for this flag is enable.
-@item @code{ntp}
-Enables time and frequency discipline.
-In effect, this switch opens and closes the feedback loop,
-which is useful for testing.
-The default for this flag is enable.
-@item @code{pps}
-Enables the pulse-per-second (PPS) signal when frequency
-and time is disciplined by the precision time kernel modifications.
-See the
-"A Kernel Model for Precision Timekeeping"
-(available as part of the HTML documentation
-provided in
-@file{/usr/share/doc/ntp})
-page for further information.
-The default for this flag is disable.
-@item @code{stats}
-Enables the statistics facility.
-See the
-@ref{Monitoring Options}
-section of
-@code{ntp.conf(5)}
-for further information.
-The default for this flag is disable.
-@end table
-@item @code{restrict} @kbd{address} @kbd{mask}@kbd{flag} @kbd{Oo} @kbd{...} @kbd{Oc}
-This command operates in the same way as the
-@code{restrict}
-configuration file commands of
-@code{ntpd(8)}.
-@item @code{unrestrict} @kbd{address} @kbd{mask}@kbd{flag} @kbd{Oo} @kbd{...} @kbd{Oc}
-Unrestrict the matching entry from the restrict list.
-@item @code{delrestrict} @kbd{address} @kbd{mask}[@code{ntpport}]
-Delete the matching entry from the restrict list.
-@item @code{readkeys}
-Causes the current set of authentication keys to be purged and
-a new set to be obtained by rereading the keys file (which must
-have been specified in the
-@code{ntpd(8)}
-configuration file).
-This
-allows encryption keys to be changed without restarting the
-server.
-@item @code{trustedkey} @kbd{keyid} @kbd{Oo} @kbd{...} @kbd{Oc}
-@item @code{untrustedkey} @kbd{keyid} @kbd{Oo} @kbd{...} @kbd{Oc}
-These commands operate in the same way as the
-@code{trustedkey}
-and
-@code{untrustedkey}
-configuration file
-commands of
-@code{ntpd(8)}.
-@item @code{authinfo}
-Returns information concerning the authentication module,
-including known keys and counts of encryptions and decryptions
-which have been done.
-@item @code{traps}
-Display the traps set in the server.
-See the source listing for
-further information.
-@item @code{addtrap} @kbd{address}[@kbd{port}][@kbd{interface}]
-Set a trap for asynchronous messages.
-See the source listing
-for further information.
-@item @code{clrtrap} @kbd{address}[@kbd{port}][@kbd{interface}]
-Clear a trap for asynchronous messages.
-See the source listing
-for further information.
-@item @code{reset}
-Clear the statistics counters in various modules of the server.
-See the source listing for further information.
-@end table
 @node ntpdc See Also
 @subsection ntpdc See Also
-@code{ntp.conf(5)},
-@code{ntpd(8)}
-@*
- David L. Mills, @emph{Network Time Protocol (Version 3)},  RFC1305.
 @node ntpdc Authors
 @subsection ntpdc Authors
-The formatting directives in this document came from FreeBSD.
 @node ntpdc Bugs
 @subsection ntpdc Bugs
-The
-@code{ntpdc}
-utility is a crude hack.
-Much of the information it shows is
-deadly boring and could only be loved by its implementer.
-The
-program was designed so that new (and temporary) features were easy
-to hack in, at great expense to the program's ease of use.
-Despite
-this, the program is occasionally useful.
-
-Please report bugs to http://bugs.ntp.org .
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index 9134ba394..295d06470 100644
--- a/ntpdc/ntpdc-opts.c
+++ b/ntpdc/ntpdc-opts.c
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.c)
  *  
- *  It has been AutoGen-ed  January  4, 2013 at 09:03:20 AM by AutoGen 5.17.1pre11
+ *  It has been AutoGen-ed  January  6, 2013 at 06:44:23 AM by AutoGen 5.17.1pre14
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 37:0:12 templates.
+ * Generated from AutoOpts 37:1:12 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
  *  ntpdc option static const strings
  */
 static char const ntpdc_opt_strs[1862] =
-/*     0 */ "ntpdc 4.2.7p345\n"
+/*     0 */ "ntpdc 4.2.7p346\n"
             "Copyright (C) 1970-2013 The University of Delaware, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -130,14 +130,14 @@ static char const ntpdc_opt_strs[1862] =
 /*  1640 */ "no-load-opts\0"
 /*  1653 */ "no\0"
 /*  1656 */ "NTPDC\0"
-/*  1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p345\n"
+/*  1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p346\n"
             "USAGE:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
 /*  1794 */ "$HOME\0"
 /*  1800 */ ".\0"
 /*  1802 */ ".ntprc\0"
 /*  1809 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1843 */ "\n\n\0"
-/*  1846 */ "ntpdc 4.2.7p345";
+/*  1846 */ "ntpdc 4.2.7p346";
 
 /*
  *  ipv4 option description with
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index ec0df8d14..fd905360d 100644
--- a/ntpdc/ntpdc-opts.h
+++ b/ntpdc/ntpdc-opts.h
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.h)
  *  
- *  It has been AutoGen-ed  January  4, 2013 at 09:03:20 AM by AutoGen 5.17.1pre11
+ *  It has been AutoGen-ed  January  6, 2013 at 06:44:23 AM by AutoGen 5.17.1pre14
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 37:0:12 templates.
+ * Generated from AutoOpts 37:1:12 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -53,7 +53,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 151552
+#define AO_TEMPLATE_VERSION 151553
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -82,8 +82,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.7p345"
-#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p345"
+#define NTPDC_VERSION       "4.2.7p346"
+#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p346"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman
index 67b0033d3..9d8d24af5 100644
--- a/ntpdc/ntpdc.1ntpdcman
+++ b/ntpdc/ntpdc.1ntpdcman
@@ -1,8 +1,8 @@
-.TH ntpdc 1ntpdcman "04 Jan 2013" "4.2.7p345" "User Commands"
+.TH ntpdc 1ntpdcman "06 Jan 2013" "4.2.7p346" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  4, 2013 at 09:03:28 AM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  6, 2013 at 06:44:32 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -868,7 +868,9 @@ to hack in, at great expense to the program's ease of use.
 Despite
 this, the program is occasionally useful.
 .PP
-Please report bugs to http://bugs.ntp.org .Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
+Please report bugs to http://bugs.ntp.org .
+.PP
+Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH "NOTES"
 This manual page was \fIAutoGen\fP-erated from the \fBntpdc\fP
 option definitions.
diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc
index e881625f7..a77c760f8 100644
--- a/ntpdc/ntpdc.1ntpdcmdoc
+++ b/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd January 4 2013
+.Dd January 6 2013
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  4, 2013 at 09:03:34 AM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  6, 2013 at 06:44:38 AM by AutoGen 5.17.1pre14
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -812,7 +812,9 @@ to hack in, at great expense to the program's ease of use.
 Despite
 this, the program is occasionally useful.
 .Pp
-Please report bugs to http://bugs.ntp.org .Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
+Please report bugs to http://bugs.ntp.org .
+.Pp
+Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh "NOTES"
 This manual page was \fIAutoGen\fP\-erated from the \fBntpdc\fP
 option definitions.
diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html
index d9d2a56ec..f31825c49 100644
--- a/ntpdc/ntpdc.html
+++ b/ntpdc/ntpdc.html
@@ -36,11 +36,18 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  
      This document applies to version 4.2.7p345 of ntpdc.
+  
      This document applies to version 4.2.7p346 of ntpdc.
 
   
      The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
 
+  
      
+
      Short Contents
      
+
+
      
+