From: Harlan Stenn Date: Fri, 4 Jan 2013 09:05:47 +0000 (+0000) Subject: NTP_4_2_7P345 X-Git-Tag: NTP_4_2_7P345^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3df16f40dde5c0b549a90bda034d40b3873589c;p=thirdparty%2Fntp.git NTP_4_2_7P345 bk: 50e69b6bDteSv_LolUuMBLOhq0BSSA --- diff --git a/ChangeLog b/ChangeLog index 0faa31a89..5a1037b65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p345) 2013/01/04 Released by Harlan Stenn * Update several .def files to use autogen-5.17 feature set. (4.2.7p344) 2013/01/03 Released by Harlan Stenn * Refactor and enhance mdoc2texi. diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 701af3c3e..4b12faa36 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 3, 2013 at 01:09:25 PM by AutoGen 5.17.1pre11 +# It has been AutoGen-ed January 4, 2013 at 09:03:01 AM by AutoGen 5.17.1pre11 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -2716,5 +2716,5 @@ These should be obtained via secure directory services when they become universally available. @node ntp.conf Notes @subsection ntp.conf Notes -This document corresponds to version @VERSION@ of NTP. +This document corresponds to version #VERSION# of NTP. This document was derived from FreeBSD. diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index 879ee25cb..f5ad52a0a 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 3, 2013 at 01:09:27 PM by AutoGen 5.17.1pre11 +# It has been AutoGen-ed January 4, 2013 at 09:03:03 AM by AutoGen 5.17.1pre11 # From the definitions ntp.keys.def # and the template file agtexi-file.tpl @end ignore @@ -124,5 +124,5 @@ the default name of the configuration file @code{sntp(1sntpmdoc)} @node ntp.keys Notes @subsection ntp.keys Notes -This document corresponds to version @VERSION@ of NTP. +This document corresponds to version #VERSION# of NTP. This document was derived from FreeBSD. diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index d51cb49ee..bedacbb1d 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 3, 2013 at 01:09:28 PM by AutoGen 5.17.1pre11 +# It has been AutoGen-ed January 4, 2013 at 09:03:04 AM by AutoGen 5.17.1pre11 # 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.7p344 +ntpd - NTP daemon program - Ver. 4.2.7p345 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description @@ -674,8 +674,8 @@ The command line options relating to configuration and/or usage help are: 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: @table @samp @item version @@ -1173,5 +1173,5 @@ a busy primary server, rather than a high stratum workstation in mind. @node ntpd Notes @subsection ntpd Notes -This document corresponds to version @VERSION@ of NTP. +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 1c46d1821..7d9eede4b 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -1,8 +1,8 @@ -.TH ntp.conf 5man "03 Jan 2013" "4.2.7p344" "File Formats" +.TH ntp.conf 5man "04 Jan 2013" "4.2.7p345" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 3, 2013 at 01:09:10 PM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 4, 2013 at 09:02:47 AM by AutoGen 5.17.1pre11 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" @@ -1165,7 +1165,7 @@ the file generation set named The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next five fields -show time offset (seconds), frequency offset (parts per million - +show time offset (seconds), frequency offset (parts per million \- PPM), RMS jitter (seconds), Allan deviation (PPM) and clock discipline time constant. .ti -4 @@ -1181,7 +1181,7 @@ generation set named .br .in +4 .nf -48773 10847.650 127.127.4.1 9714 -0.001605376 0.000000000 0.001424877 0.000958674 +48773 10847.650 127.127.4.1 9714 \-0.001605376 0.000000000 0.001424877 0.000958674 .in -4 .fi .PP @@ -2618,7 +2618,7 @@ keywords can be prefixed with .Ql = , .Ql + and -.Ql - , +.Ql \- , where .Ql = sets the @@ -2626,7 +2626,7 @@ sets the priority mask, .Ql + adds and -.Ql - +.Ql \- removes messages. .Xr syslog 3 @@ -2698,7 +2698,7 @@ This command specifies the location of an alternate log file to be used instead of the default system .Xr syslog 3 facility. -This is the same operation as the -l command line option. +This is the same operation as the \-l command line option. .TP .BR Ic setvar Ar variable Op Cm default This command adds an additional system variable. @@ -2850,6 +2850,46 @@ In manycast mode these values are used in turn in an expanding-ring search. The default is eight multiples of 32 starting at 31. +.SH "OPTIONS" +.TP +.BR \-\-help +Display usage information and exit. +.TP +.BR \-\-more-help +Pass the extended usage information through a pager. +.TP +.BR \-\-version "[=\fI{v|c|n}\fP]" +Output version of program and exit. The default mode is `v', a simple +version. The `c' mode will print copyright information and `n' will +print the full copyright notice. +.SH "OPTION PRESETS" +Any option that is not marked as \fInot presettable\fP may be preset +by loading values from environment variables named: +.nf + \fBNTP_CONF_\fP or \fBNTP_CONF\fP +.fi +.ad +cvt_prog='/usr/local/gnu/share/autogen/texi2man' +cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd + `/`basename "$cvt_prog"` +cd $tmp_dir +test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" +{ + list='synopsis description options option-presets' + for f in $list ; do cat $f ; echo ; done + rm \-f $list name + list='implementation-notes environment files examples exit-status errors + compatibility see-also conforming-to history authors copyright bugs + notes' + for f in $list ; do cat $f ; echo ; done > .end-doc + rm \-f $list + list=`ls \-1 *`' .end-doc' + for f in $list ; do cat $f ; echo ; done + rm \-f $list +} 1>.doc 2>/dev/null +sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +.SH "ENVIRONMENT" +See \fBOPTION PRESETS\fP for configuration environment variables. .SH FILES .TP .BR Pa /etc/ntp.conf @@ -2866,6 +2906,18 @@ RSA public key .TP .BR Pa ntp_dh Diffie-Hellman agreement parameters +.SH "EXIT STATUS" +One of the following exit values will be returned: +.TP +.BR 0 " (EXIT_SUCCESS)" +Successful program execution. +.TP +.BR 1 " (EXIT_FAILURE)" +The operation failed or the command syntax was not valid. +.TP +.BR 70 " (EX_SOFTWARE)" +libopts had an internal operational error. Please report +it to autogen-users@lists.sourceforge.net. Thank you. .SH "SEE ALSO" .SH SEE ALSO .Xr ntpd 1ntpdmdoc , @@ -2900,8 +2952,7 @@ 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 .SH NOTES -This document corresponds to version @VERSION@ of NTP. -This document was derived from FreeBSD. -.PP +This document corresponds to version 4.2.7p345 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 f79966395..40ee65c70 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd January 3 2013 +.Dd January 4 2013 .Dt NTP_CONF 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 3, 2013 at 01:09:31 PM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 4, 2013 at 09:03:06 AM by AutoGen 5.17.1pre11 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -11,8 +11,8 @@ .Nd Network Time Protocol (NTP) daemon configuration file format .Sh SYNOPSIS .Nm -.Op Fl \-option-name -.Op Fl \-option-name Ar value +.Op Fl \-option\-name +.Op Fl \-option\-name Ar value .Pp All arguments must be options. .Pp @@ -43,7 +43,7 @@ followed by a list of arguments, some of which may be optional, separated by whitespace. Commands may not be continued over multiple lines. Arguments may be host names, -host addresses written in numeric, dotted-quad form, +host addresses written in numeric, dotted\-quad form, integers, floating point numbers (when specifying times in seconds) and text strings. .Pp @@ -108,7 +108,7 @@ Use of options not listed may not be caught as an error, but may result in some weird and even destructive behavior. .Pp -If the Basic Socket Interface Extensions for IPv6 (RFC-2553) +If the Basic Socket Interface Extensions for IPv6 (RFC\-2553) is detected, support for the IPv6 address family is generated in addition to the default support of the IPv4 address family. In a few cases, including the reslist billboard generated @@ -177,7 +177,7 @@ be used and the mode in which to operate. The .Ar address can be -either a DNS name or an IP address in dotted-quad notation. +either a DNS name or an IP address in dotted\-quad notation. Additional information on association behavior can be found in the .Qq Association Management page @@ -204,7 +204,7 @@ be used for type b or m addresses. .It Ic peer For type s addresses (only), this command mobilizes a -persistent symmetric-active mode association with the specified +persistent symmetric\-active mode association with the specified remote peer. In this mode the local clock can be synchronized to the remote peer or the remote peer can be synchronized to the local @@ -345,7 +345,7 @@ for further information. .It Cm ttl Ar ttl This option is used only with broadcast server and manycast client modes. -It specifies the time-to-live +It specifies the time\-to\-live .Ar ttl to use on broadcast server and multicast server and the maximum @@ -358,7 +358,7 @@ network administrator. .It Cm version Ar version Specifies the version number to be used for outgoing NTP packets. -Versions 1-4 are the choices, with version 4 the +Versions 1\-4 are the choices, with version 4 the default. .El .Ss Auxiliary Commands @@ -373,7 +373,7 @@ server, then enters the broadcast client mode, in which it synchronizes to succeeding broadcast messages. Note that, in order to avoid accidental or malicious disruption in this mode, both the -server and client should operate using symmetric-key or public-key +server and client should operate using symmetric\-key or public\-key authentication as described in .Sx Authentication Options . .It Ic manycastserver Ar address ... @@ -386,7 +386,7 @@ taken to limit the span of the reply and avoid a possibly massive implosion at the original sender. Note that, in order to avoid accidental or malicious disruption in this mode, both the server -and client should operate using symmetric-key or public-key +and client should operate using symmetric\-key or public\-key authentication as described in .Sx Authentication Options . .It Ic multicastclient Ar address ... @@ -399,8 +399,8 @@ exchange with the server, then enters the broadcast client mode, in which it synchronizes to succeeding multicast messages. Note that, in order to avoid accidental or malicious disruption in this mode, -both the server and client should operate using symmetric-key or -public-key authentication as described in +both the server and client should operate using symmetric\-key or +public\-key authentication as described in .Sx Authentication Options . .El .Sh Authentication Support @@ -408,15 +408,15 @@ Authentication support allows the NTP client to verify that the server is in fact known and trusted and not an intruder intending accidentally or on purpose to masquerade as that server. The NTPv3 -specification RFC-1305 defines a scheme which provides +specification RFC\-1305 defines a scheme which provides cryptographic authentication of received NTP packets. Originally, this was done using the Data Encryption Standard (DES) algorithm operating in Cipher Block Chaining (CBC) mode, commonly called -DES-CBC. +DES\-CBC. Subsequently, this was replaced by the RSA Message Digest -5 (MD5) algorithm using a private key, commonly called keyed-MD5. -Either algorithm computes a message digest, or one-way hash, which +5 (MD5) algorithm using a private key, commonly called keyed\-MD5. +Either algorithm computes a message digest, or one\-way hash, which can be used to verify the server has the correct private key and key identifier. .Pp @@ -537,9 +537,9 @@ cryptography are summarized below; further details are in the briefings, papers and reports at the NTP project page linked from .Li http://www.ntp.org/ . -.Ss Symmetric-Key Cryptography -The original RFC-1305 specification allows any one of possibly -65,534 keys, each distinguished by a 32-bit key identifier, to +.Ss Symmetric\-Key Cryptography +The original RFC\-1305 specification allows any one of possibly +65,534 keys, each distinguished by a 32\-bit key identifier, to authenticate an association. The servers and clients involved must agree on the key and key identifier to @@ -587,7 +587,7 @@ command selects the key used as the password for the utility. .Ss Public Key Cryptography NTPv4 supports the original NTPv3 symmetric key scheme -described in RFC-1305 and in addition the Autokey protocol, +described in RFC\-1305 and in addition the Autokey protocol, which is based on public key cryptography. The Autokey Version 2 protocol described on the Autokey Protocol page verifies packet integrity using MD5 message digests @@ -615,8 +615,8 @@ corresponding to the various NTP modes supported. Most modes use a special cookie which can be computed independently by the client and server, but encrypted in transmission. -All modes use in addition a variant of the S-KEY scheme, -in which a pseudo-random key list is generated and used +All modes use in addition a variant of the S\-KEY scheme, +in which a pseudo\-random key list is generated and used in reverse order. These schemes are described along with an executive summary, current status, briefing slides and reading list on the @@ -626,7 +626,7 @@ page. The specific cryptographic environment used by Autokey servers and clients is determined by a set of files and soft links generated by the -.Xr ntp-keygen 1ntpkeygenmdoc +.Xr ntp\-keygen 1ntpkeygenmdoc program. This includes a required host key file, required certificate file and optional sign key file, @@ -756,7 +756,7 @@ If it's the same key and the message is verified, Bob sends Cathy a reply authenticated with that key. If verification fails, -Bob sends Cathy a thing called a crypto-NAK, which tells her +Bob sends Cathy a thing called a crypto\-NAK, which tells her something broke. She can see the evidence using the .Xr ntpq 1ntpqmdoc @@ -780,7 +780,7 @@ with one server and no authentication with another might not be wise. .Ss Key Management The cryptographic values used by the Autokey protocol are incorporated as a set of files generated by the -.Xr ntp-keygen 1ntpkeygenmdoc +.Xr ntp\-keygen 1ntpkeygenmdoc utility program, including symmetric key, host key and public certificate files, as well as sign key, identity parameters and leapseconds files. @@ -828,7 +828,7 @@ sent. Specifies the key identifier to use with the .Xr ntpq 1ntpqmdoc utility, which uses the standard -protocol defined in RFC-1305. +protocol defined in RFC\-1305. The .Ar key argument is @@ -940,11 +940,11 @@ argument is a key identifier for the trusted key, where the value can be in the range 1 to 65,534, inclusive. .It Ic revoke Ar logsec -Specifies the interval between re-randomization of certain +Specifies the interval between re\-randomization of certain cryptographic values used by the Autokey scheme, as a power of 2 in seconds. These values need to be updated frequently in order to -deflect brute-force attacks on the algorithms of the scheme; +deflect brute\-force attacks on the algorithms of the scheme; however, updating some values is a relatively expensive operation. The default interval is 16 (65,536 s or about 18 hours). For poll @@ -964,7 +964,7 @@ purpose, although different keys can be used with different servers. The .Ar key -arguments are 32-bit unsigned +arguments are 32\-bit unsigned integers with values from 1 to 65,534. .El .Ss Error Codes @@ -1060,7 +1060,7 @@ the file generation set named The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next field shows the -clock address in dotted-quad notation. +clock address in dotted\-quad notation. The final field shows the last timecode received from the clock in decoded ASCII format, where meaningful. @@ -1082,7 +1082,7 @@ following form to the file generation set named The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next field shows the peer -address in dotted-quad notation, The final message field includes the +address in dotted\-quad notation, The final message field includes the message type and certain ancillary information. See the .Sx Authentication Options @@ -1100,7 +1100,7 @@ the file generation set named The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next five fields -show time offset (seconds), frequency offset (parts per million - +show time offset (seconds), frequency offset (parts per million \- PPM), RMS jitter (seconds), Allan deviation (PPM) and clock discipline time constant. .It Cm peerstats @@ -1113,20 +1113,20 @@ line of the following form to the current element of a file generation set named .Cm peerstats : .Bd -literal -48773 10847.650 127.127.4.1 9714 -0.001605376 0.000000000 0.001424877 0.000958674 +48773 10847.650 127.127.4.1 9714 \-0.001605376 0.000000000 0.001424877 0.000958674 .Ed .Pp The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next two fields -show the peer address in dotted-quad notation and status, +show the peer address in dotted\-quad notation and status, respectively. The status field is encoded in hex in the format described in Appendix A of the NTP specification RFC 1305. The final four fields show the offset, delay, dispersion and RMS jitter, all in seconds. .It Cm rawstats -Enables recording of raw-timestamp statistics information. +Enables recording of raw\-timestamp statistics information. This includes statistics records of all peers of a NTP server and of special signals, where present and configured. @@ -1142,7 +1142,7 @@ The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next two fields show the remote peer or clock address followed by the local address -in dotted-quad notation. +in dotted\-quad notation. The final four fields show the originate, receive, transmit and final NTP timestamps in order. The timestamp @@ -1240,7 +1240,7 @@ modifications via the .Ar filegen option. It is defined by the -server, usually specified as a compile-time constant. +server, usually specified as a compile\-time constant. It may, however, be configurable for individual file generation sets via other commands. @@ -1306,7 +1306,7 @@ and a day specification in the form .Cm YYYYMMdd . .Cm YYYY -is a 4-digit year number (e.g., 1992). +is a 4\-digit year number (e.g., 1992). .Cm MM is a two digit month number. .Cm dd @@ -1318,21 +1318,21 @@ in a file named .It Cm week Any file set member contains data related to a certain week of a year. -The term week is defined by computing day-of-year +The term week is defined by computing day\-of\-year modulo 7. Elements of such a file generation set are distinguished by appending the following suffix to the file set -filename base: A dot, a 4-digit year number, the letter +filename base: A dot, a 4\-digit year number, the letter .Cm W , -and a 2-digit week number. +and a 2\-digit week number. For example, information from January, 10th 1992 would end up in a file with suffix .No . Ns Ar 1992W1 . .It Cm month One generation file set element is generated per month. The -file name suffix consists of a dot, a 4-digit year number, and -a 2-digit month. +file name suffix consists of a dot, a 4\-digit year number, and +a 2\-digit month. .It Cm year One generation file element is generated per year. The filename @@ -1343,9 +1343,9 @@ the file set every 24 hours of server operation. The filename suffix consists of a dot, the letter .Cm a , -and an 8-digit number. +and an 8\-digit number. This number is taken to be the number of seconds the server is -running at the start of the corresponding 24-hour period. +running at the start of the corresponding 24\-hour period. Information is only written to a file generation by specifying .Cm enable ; output is prevented by specifying @@ -1423,7 +1423,7 @@ an indefinate period. When a client or network is denied access for an indefinate period, the only way at present to remove the restrictions is by restarting the server. -.Ss The Kiss-of-Death Packet +.Ss The Kiss\-of\-Death Packet Ordinarily, packets denied service are simply dropped with no further action except incrementing statistics counters. Sometimes a @@ -1431,9 +1431,9 @@ more proactive response is needed, such as a server message that explicitly requests the client to stop sending and leave a message for the system operator. A special packet format has been created -for this purpose called the "kiss-of-death" (KoD) packet. +for this purpose called the "kiss\-of\-death" (KoD) packet. KoD packets have the leap bits set unsynchronized and stratum set -to zero and the reference identifier field set to a four-byte +to zero and the reference identifier field set to a four\-byte ASCII code. If the .Cm noserve @@ -1476,11 +1476,11 @@ spacing, while the .Cm minimum subcommand specifies the minimum packet spacing. Packets that violate these minima are discarded -and a kiss-o'-death packet returned if enabled. +and a kiss\-o'\-death packet returned if enabled. The default minimum average and minimum are 5 and 2, respectively. The monitor subcommand specifies the probability of discard -for packets that overflow the rate-control window. +for packets that overflow the rate\-control window. .It Xo Ic restrict address .Op Cm mask Ar mask .Op Ar flag ... @@ -1488,13 +1488,13 @@ for packets that overflow the rate-control window. The .Ar address argument expressed in -dotted-quad form is the address of a host or network. +dotted\-quad form is the address of a host or network. Alternatively, the .Ar address argument can be a valid host DNS name. The .Ar mask -argument expressed in dotted-quad form defaults to +argument expressed in dotted\-quad form defaults to .Cm 255.255.255.255 , meaning that the .Ar address @@ -1518,7 +1518,7 @@ in that more restrictive flags will often make less restrictive ones redundant. The flags can generally be classed into two categories, those which restrict time service and those which -restrict informational queries and attempts to do run-time +restrict informational queries and attempts to do run\-time reconfiguration of the server. One or more of the following flags may be specified: @@ -1530,7 +1530,7 @@ and .Xr ntpdc 1ntpdcmdoc queries. .It Cm kod -If this flag is set when an access violation occurs, a kiss-o'-death +If this flag is set when an access violation occurs, a kiss\-o'\-death (KoD) packet is sent. KoD packets are rate limited to no more than one per second. @@ -1599,7 +1599,7 @@ UDP port (123). Both .Cm ntpport and -.Cm non-ntpport +.Cm non\-ntpport may be specified. The @@ -1634,7 +1634,7 @@ of the nearby manycast servers, yet automatically reconfigures to sustain this number of servers should one or another fail. .Pp Note that the manycasting paradigm does not coincide -with the anycast paradigm described in RFC-1546, +with the anycast paradigm described in RFC\-1546, which is designed to find a single server from a clique of servers providing the same service. The manycast paradigm is designed to find a plurality @@ -1663,7 +1663,7 @@ The IANA has designated IPv4 address 224.1.1.1 and IPv6 address FF05::101 (site local) for NTP. When more servers are needed, it broadcasts manycast client messages to this address at the minimum feasible rate -and minimum feasible time-to-live (TTL) hops, depending +and minimum feasible time\-to\-live (TTL) hops, depending on how many servers have already been found. There can be as many manycast client associations as different group address, each one serving as a template @@ -1693,7 +1693,7 @@ Then, the client polls the server at its unicast address in burst mode in order to reliably set the host clock and validate the source. This normally results -in a volley of eight client/server at 2-s intervals +in a volley of eight client/server at 2\-s intervals during which both the synchronization and cryptographic protocols run concurrently. Following the volley, @@ -1706,7 +1706,7 @@ in ordinary client/server mode. .Pp The manycast client polling strategy is designed to reduce as much as possible the volume of manycast client messages -and the effects of implosion due to near-simultaneous +and the effects of implosion due to near\-simultaneous arrival of manycast server messages. The strategy is determined by the .Ic manycastclient , @@ -1872,7 +1872,7 @@ servers will find the servers at the same stratum level. If one of the primary servers loses its GPS receiver, it will continue to operate as a client and other clients will time out the corresponding association and -re-associate accordingly. +re\-associate accordingly. .Pp Some administrators prefer to avoid running .Xr ntpd 1ntpdmdoc @@ -1994,13 +1994,13 @@ a single falseticker. This command specifies a list of TTL values in increasing order, up to 8 values can be specified. In manycast mode these values are used in turn -in an expanding-ring search. +in an expanding\-ring search. The default is eight multiples of 32 starting at 31. .El .Sh Reference Clock Support The NTP Version 4 daemon supports some three dozen different radio, -satellite and modem reference clocks plus a special pseudo-clock +satellite and modem reference clocks plus a special pseudo\-clock used for backup or when no other clock source is available. Detailed descriptions of individual device drivers and options can be found in the @@ -2020,7 +2020,7 @@ provided in .Pa /usr/share/doc/ntp ) . In addition, support for a PPS signal is available as described in the -.Qq Pulse-per-second (PPS) Signal Interfacing +.Qq Pulse\-per\-second (PPS) Signal Interfacing page (available as part of the HTML documentation provided in @@ -2070,7 +2070,7 @@ is an integer denoting the clock type and .Ar u indicates the unit -number in the range 0-3. +number in the range 0\-3. While it may seem overkill, it is in fact sometimes useful to configure multiple reference clocks of the same type, in which case the unit numbers must be unique. @@ -2130,7 +2130,7 @@ and options can be used to override the defaults for the device. There are two optional -device-dependent time offsets and four flags that can be included +device\-dependent time offsets and four flags that can be included in the .Ic fudge command as well. @@ -2147,7 +2147,7 @@ The .Cm stratum option is used for this purpose. Also, in cases -involving both a reference clock and a pulse-per-second (PPS) +involving both a reference clock and a pulse\-per\-second (PPS) discipline signal, it is useful to specify the reference clock identifier as other than the default, depending on the driver. The @@ -2184,7 +2184,7 @@ provided in for further information. .It Cm mode Ar int Specifies a mode number which is interpreted in a -device-specific fashion. +device\-specific fashion. For instance, it selects a dialing protocol in the ACTS driver and a device subtype in the parse @@ -2234,7 +2234,7 @@ follows: .Bl -tag -width indent .It Cm time1 Ar sec Specifies a constant to be added to the time offset produced by -the driver, a fixed-point decimal number in seconds. +the driver, a fixed\-point decimal number in seconds. This is used as a calibration constant to adjust the nominal time offset of a particular clock to agree with an external standard, such as a @@ -2262,8 +2262,8 @@ page provided in .Pa /usr/share/doc/ntp ) . .It Cm time2 Ar secs -Specifies a fixed-point decimal number in seconds, which is -interpreted in a driver-dependent way. +Specifies a fixed\-point decimal number in seconds, which is +interpreted in a driver\-dependent way. See the descriptions of specific drivers in the .Qq Reference Clock Drivers @@ -2284,7 +2284,7 @@ overrides the default identifier ordinarily assigned by the driver itself. .It Cm mode Ar int Specifies a mode number which is interpreted in a -device-specific fashion. +device\-specific fashion. For instance, it selects a dialing protocol in the ACTS driver and a device subtype in the parse @@ -2351,7 +2351,7 @@ frequency of zero. .Pp The file format consists of a single line containing a single floating point number, which records the frequency offset measured -in parts-per-million (PPM). +in parts\-per\-million (PPM). The file is updated by first writing the current drift value into a temporary file and then renaming this file to replace the old version. @@ -2428,7 +2428,7 @@ The default for this flag is .Ic enable . .It Cm pps -Enables the pulse-per-second (PPS) signal when frequency and time is +Enables the pulse\-per\-second (PPS) signal when frequency and time is disciplined by the precision time kernel modifications. See the .Qq A Kernel Model for Precision Timekeeping @@ -2471,7 +2471,7 @@ keywords can be prefixed with .Ql = , .Ql + and -.Ql - , +.Ql \- , where .Ql = sets the @@ -2479,7 +2479,7 @@ sets the priority mask, .Ql + adds and -.Ql - +.Ql \- removes messages. .Xr syslog 3 @@ -2544,7 +2544,7 @@ This command specifies the location of an alternate log file to be used instead of the default system .Xr syslog 3 facility. -This is the same operation as the -l command line option. +This is the same operation as the \-l command line option. .It Ic setvar Ar variable Op Cm default This command adds an additional system variable. These @@ -2624,12 +2624,12 @@ The argument becomes the new value for the dispersion increase rate, normally .000015 s/s. .It Cm freq Ar freq The argument becomes the initial value of the frequency offset in -parts-per-million. +parts\-per\-million. This overrides the value in the frequency file, if present, and avoids the initial training state if it is not. .It Cm huffpuff Ar huffpuff The argument becomes the new value for the experimental -huff-n'-puff filter span, which determines the most recent interval +huff\-n'\-puff filter span, which determines the most recent interval the algorithm will search for a minimum delay. The lower limit is 900 s (15 m), but a more reasonable value is 7200 (2 hours). @@ -2682,10 +2682,49 @@ is started. This command specifies a list of TTL values in increasing order, up to 8 values can be specified. In manycast mode these values are used in turn in -an expanding-ring search. +an expanding\-ring search. The default is eight multiples of 32 starting at 31. .El +.Sh "OPTIONS" +.Bl -tag +.It \-\-help +Display usage information and exit. +.It \-\-more\-help +Pass the extended usage information through a pager. +.It \-\-version "[=\fI{v|c|n}\fP]" +Output version of program and exit. The default mode is `v', a simple +version. The `c' mode will print copyright information and `n' will +print the full copyright notice. +.El +.Sh "OPTION PRESETS" +Any option that is not marked as \fInot presettable\fP may be preset +by loading values from environment variables named: +.nf + \fBNTP_CONF_\fP or \fBNTP_CONF\fP +.fi +.ad +cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' +cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd + `/`basename "$cvt_prog"` +cd $tmp_dir +test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" +{ + list='synopsis description options option\-presets' + for f in $list ; do cat $f ; echo ; done + rm \-f $list name + list='implementation\-notes environment files examples exit\-status errors + compatibility see\-also conforming\-to history authors copyright bugs + notes' + for f in $list ; do cat $f ; echo ; done > .end\-doc + rm \-f $list + list=`ls \-1 *`' .end\-doc' + for f in $list ; do cat $f ; echo ; done + rm \-f $list +} 1>.doc 2>/dev/null +sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +.Sh "ENVIRONMENT" +See \fBOPTION PRESETS\fP for configuration environment variables. .Sh FILES .Bl -tag -width /etc/ntp.drift -compact .It Pa /etc/ntp.conf @@ -2697,7 +2736,18 @@ RSA private key .It Pa ntpkey_ Ns Ar host RSA public key .It Pa ntp_dh -Diffie-Hellman agreement parameters +Diffie\-Hellman agreement parameters +.El +.Sh "EXIT STATUS" +One of the following exit values will be returned: +.Bl -tag +.It 0 " (EXIT_SUCCESS)" +Successful program execution. +.It 1 " (EXIT_FAILURE)" +The operation failed or the command syntax was not valid. +.It 70 " (EX_SOFTWARE)" +libopts had an internal operational error. Please report +it to autogen\-users@lists.sourceforge.net. Thank you. .El .Sh "SEE ALSO" .Sh SEE ALSO @@ -2719,7 +2769,7 @@ A snapshot of this documentation is available in HTML format in .Sh "AUTHORS" The University of Delaware .Sh "COPYRIGHT" -Copyright (C) 1970-2013 The University of Delaware all rights reserved. +Copyright (C) 1970\-2013 The University of Delaware all rights reserved. This program is released under the terms of the NTP license, . .Sh BUGS The syntax checking is not picky; some combinations of @@ -2733,8 +2783,7 @@ 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 .Sh NOTES -This document corresponds to version @VERSION@ of NTP. -This document was derived from FreeBSD. -.Pp -This manual page was \fIAutoGen\fP-erated from the \fBntp.conf\fP +This document corresponds to version 4.2.7p345 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 048c1c3e7..09b3e38bd 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.7p344 of ntp.conf. +

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

  • ntp.conf Description @@ -74,7 +74,8 @@ Usually, it is installed in the directory, but could be installed elsewhere (see the daemon's --c command line option). +-c +command line option).

    The file format is similar to other UNIX @@ -94,56 +95,45 @@ and text strings.

    The rest of this page describes the configuration and control options. The -"Notes on Configuring NTP and Setting up a NTP Subnet" +"Notes on Configuring NTP and Setting up an NTP Subnet" page (available as part of the HTML documentation provided in /usr/share/doc/ntp) contains an extended discussion of these options. In addition to the discussion of general -ConfigurationConfiguration -Options -, +Configuration Options, there are sections describing the following supported functionality and the options used to control it:

    Following these is a section describing -MiscellaneousMiscellaneous -Options -. +Miscellaneous Options. While there is a rich set of options available, the only required option is one or more -pool, server, peer, broadcast or -manycastclient commands. +pool, +server, +peer, +broadcast +or +manycastclient +commands.

    - +
    -

    Configuration

    +

    Configuration Support

    -

    Configuration -Support -Following is a description of the configuration commands in +

    Following is a description of the configuration commands in NTPv4. These commands have the same basic functions as in NTPv3 and in some cases new functions and new arguments. @@ -154,15 +144,13 @@ clock, and auxiliary commands that specify environmental variables that control various related operations.

    - +
    -

    Configuration

    +

    Configuration Commands

    -

    Configuration -Commands -The various modes are determined by the command keyword and the +

    The various modes are determined by the command keyword and the type of the required IP address. Addresses are classed by type as (s) a remote server or peer (IPv4 class A, B and C), (b) the @@ -180,7 +168,7 @@ in addition to the default support of the IPv4 address family. In a few cases, including the reslist billboard generated by ntpdc, IPv6 addresses are automatically generated. IPv6 addresses can be identified by the presence of colons -\&: +: in the address field. IPv6 addresses can be used almost everywhere where IPv4 addresses can be used, @@ -188,48 +176,22 @@ with the exception of reference clock addresses, which are always IPv4.

    Note that in contexts where a host name is expected, a --4 qualifier preceding +-4 +qualifier preceding the host name forces DNS resolution to the IPv4 namespace, while a --6 qualifier forces DNS resolution to the IPv6 namespace. +-6 +qualifier forces DNS resolution to the IPv6 namespace. See IPv6 references for the equivalent classes for that address family.

    -
    Xo
    [burst ] -[iburst ] -[version version ] -[prefer ] -[minpoll minpoll ] -[maxpoll maxpoll ] -
    Xo
    [key key \&| Cm autokey ] -[burst ] -[iburst ] -[version version ] -[prefer ] -[minpoll minpoll ] -[maxpoll maxpoll ] -
    Xo
    [key key \&| Cm autokey ] -[version version ] -[prefer ] -[minpoll minpoll ] -[maxpoll maxpoll ] -
    Xo
    [key key \&| Cm autokey ] -[version version ] -[prefer ] -[minpoll minpoll ] -[ttl ttl ] -
    Xo
    [key key \&| Cm autokey ] -[version version ] -[prefer ] -[minpoll minpoll ] -[maxpoll maxpoll ] -[ttl ttl ] -
    +
    pool address[burst][iburst][version version][prefer][minpoll minpoll][maxpoll maxpoll]
    server address[key key | Cm autokey][burst][iburst][version version][prefer][minpoll minpoll][maxpoll maxpoll]
    peer address[key key | Cm autokey][version version][prefer][minpoll minpoll][maxpoll maxpoll]
    broadcast address[key key | Cm autokey][version version][prefer][minpoll minpoll][ttl ttl]
    manycastclient address[key key | Cm autokey][version version][prefer][minpoll minpoll][maxpoll maxpoll][ttl ttl]

    These five commands specify the time server name or address to be used and the mode in which to operate. The -address can be +address +can be either a DNS name or an IP address in dotted-quad notation. Additional information on association behavior can be found in the "Association Management" @@ -238,22 +200,22 @@ page provided in /usr/share/doc/ntp).

    -
    Ic
    For type s addresses, this command mobilizes a persistent +
    pool
    For type s addresses, this command mobilizes a persistent client mode association with a number of remote servers. In this mode the local clock can synchronized to the remote server, but the remote server can never be synchronized to the local clock. -
    Ic
    For type s and r addresses, this command mobilizes a persistent +
    server
    For type s and r addresses, this command mobilizes a persistent client mode association with the specified remote server or local radio clock. In this mode the local clock can synchronized to the remote server, but the remote server can never be synchronized to the local clock. This command should -not + not be used for type b or m addresses. -
    Ic
    For type s addresses (only), this command mobilizes a +
    peer
    For type s addresses (only), this command mobilizes a persistent symmetric-active mode association with the specified remote peer. In this mode the local clock can be synchronized to @@ -264,7 +226,7 @@ various failure scenarios, either the local or remote peer may be the better source of time. This command should NOT be used for type b, m or r addresses. -
    Ic
    For type b and m addresses (only), this +
    broadcast
    For type b and m addresses (only), this command mobilizes a persistent broadcast mode association. Multiple commands can be used to specify multiple local broadcast interfaces @@ -274,7 +236,8 @@ broadcast messages go only to the interface associated with the subnet specified, but multicast messages go to all interfaces. In broadcast mode the local server sends periodic broadcast messages to a client population at the -address specified, which is usually the broadcast address on (one of) the +address +specified, which is usually the broadcast address on (one of) the local network(s) or a multicast address assigned to NTP. The IANA has assigned the multicast group address IPv4 224.0.1.1 and @@ -284,15 +247,18 @@ messages within administrative boundaries. Ordinarily, this specification applies only to the local server operating as a sender; for operation as a broadcast client, see the -broadcastclient or -multicastclient commands +broadcastclient +or +multicastclient +commands below. -
    Ic
    For type m addresses (only), this command mobilizes a +
    manycastclient
    For type m addresses (only), this command mobilizes a manycast client mode association for the multicast address specified. In this case a specific address must be supplied which matches the address used on the -manycastserver command for +manycastserver +command for the designated manycast servers. The NTP multicast address 224.0.1.1 assigned by the IANA should NOT be used, unless specific @@ -300,30 +266,31 @@ means are taken to avoid spraying large areas of the Internet with these messages and causing a possibly massive implosion of replies at the sender. The -manycastserver command specifies that the local server +manycastserver +command specifies that the local server is to operate in client mode with the remote servers that are discovered as the result of broadcast/multicast messages. The client broadcasts a request message to the group address associated with the specified -address and specifically enabled +address +and specifically enabled servers respond to these messages. The client selects the servers providing the best time and continues as with the -server command. +server +command. The remaining servers are discarded as if never heard.

    Options:

    -
    Cm
    All packets sent to and received from the server or peer are to +
    autokey
    All packets sent to and received from the server or peer are to include authentication fields encrypted using the autokey scheme described in -AuthenticationAuthentication -Options -. -
    Cm
    when the server is reachable, send a burst of eight packets +Authentication Options. +
    burst
    when the server is reachable, send a burst of eight packets instead of the usual one. The packet spacing is normally 2 s; however, the spacing between the first and second packets @@ -331,8 +298,9 @@ can be changed with the calldelay command to allow additional time for a modem or ISDN call to complete. This is designed to improve timekeeping quality with the -server command and s addresses. -
    Cm
    When the server is unreachable, send a burst of eight packets +server +command and s addresses. +
    iburst
    When the server is unreachable, send a burst of eight packets instead of the usual one. The packet spacing is normally 2 s; however, the spacing between the first two packets can be @@ -340,27 +308,32 @@ changed with the calldelay command to allow additional time for a modem or ISDN call to complete. This is designed to speed the initial synchronization acquisition with the -server command and s addresses and when +server +command and s addresses and when ntpd(1ntpdmdoc) is started with the --q option. -
    Cm
    All packets sent to and received from the server or peer are to +-q +option. +
    key key
    All packets sent to and received from the server or peer are to include authentication fields encrypted using the specified -key identifier with values from 1 to 65534, inclusive. +key +identifier with values from 1 to 65534, inclusive. The default is to include no encryption field. -
    Cm
    Cm
    These options specify the minimum and maximum poll intervals +
    minpoll minpoll
    maxpoll maxpoll
    These options specify the minimum and maximum poll intervals for NTP messages, as a power of 2 in seconds The maximum poll interval defaults to 10 (1,024 s), but can be increased by the -maxpoll option to an upper limit of 17 (36.4 h). +maxpoll +option to an upper limit of 17 (36.4 h). The minimum poll interval defaults to 6 (64 s), but can be decreased by the -minpoll option to a lower limit of 4 (16 s). -
    Cm
    Marks the server as unused, except for display purposes. +minpoll +option to a lower limit of 4 (16 s). +
    noselect
    Marks the server as unused, except for display purposes. The server is discarded by the selection algroithm. -
    Cm
    Marks the server as preferred. +
    prefer
    Marks the server as preferred. All other things being equal, this host will be chosen for synchronization among a set of correctly operating hosts. @@ -371,33 +344,33 @@ page provided in /usr/share/doc/ntp) for further information. -
    Cm
    This option is used only with broadcast server and manycast +
    ttl ttl
    This option is used only with broadcast server and manycast client modes. It specifies the time-to-live -ttl to +ttl +to use on broadcast server and multicast server and the maximum -ttl for the expanding ring search with manycast +ttl +for the expanding ring search with manycast client packets. Selection of the proper value, which defaults to 127, is something of a black art and should be coordinated with the network administrator. -
    Cm
    Specifies the version number to be used for outgoing NTP +
    version version
    Specifies the version number to be used for outgoing NTP packets. Versions 1-4 are the choices, with version 4 the default.

    - +
    -

    Auxiliary

    +

    Auxiliary Commands

    -

    Auxiliary -Commands

    -
    Ic
    This command enables reception of broadcast server messages to +
    broadcastclient
    This command enables reception of broadcast server messages to any local interface (type b) address. Upon receiving a message for the first time, the broadcast client measures the nominal server @@ -408,10 +381,8 @@ Note that, in order to avoid accidental or malicious disruption in this mode, both the server and client should operate using symmetric-key or public-key authentication as described in -AuthenticationAuthentication -Options -. -
    Ic
    This command enables reception of manycast client messages to +Authentication Options. +
    manycastserver address ...
    This command enables reception of manycast client messages to the multicast group address(es) (type m) specified. At least one address is required, but the NTP multicast address 224.0.1.1 @@ -422,10 +393,8 @@ Note that, in order to avoid accidental or malicious disruption in this mode, both the server and client should operate using symmetric-key or public-key authentication as described in -AuthenticationAuthentication -Options -. -
    Ic
    This command enables reception of multicast server messages to +Authentication Options. +
    multicastclient address ...
    This command enables reception of multicast server messages to the multicast group address(es) (type m) specified. Upon receiving a message for the first time, the multicast client measures the @@ -436,21 +405,17 @@ Note that, in order to avoid accidental or malicious disruption in this mode, both the server and client should operate using symmetric-key or public-key authentication as described in -AuthenticationAuthentication -Options -. +Authentication Options.
    -
    +

    - +
    -

    Authentication

    +

    Authentication Support

    -

    Authentication -Support -Authentication support allows the NTP client to verify that the +

    Authentication support allows the NTP client to verify that the server is in fact known and trusted and not an intruder intending accidentally or on purpose to masquerade as that server. The NTPv3 @@ -490,12 +455,17 @@ are on the Building and Installing the Distribution page.

    Authentication is configured separately for each association using the -key or -autokey subcommand on the -peer, server, broadcast and -manycastclient configuration commands as described in -ConfigurationConfiguration -Options +key +or +autokey +subcommand on the +peer, +server, +broadcast +and +manycastclient +configuration commands as described in +Configuration Options page. The authentication options described below specify the locations of the key files, @@ -522,11 +492,14 @@ the server certificate, verify its credentials and initialize the protocol

    The -auth flag controls whether new associations or +auth +flag controls whether new associations or remote configuration commands require cryptographic authentication. This flag can be set or reset by the -enable and -disable commands and also by remote +enable +and +disable +commands and also by remote configuration commands sent by a ntpdc(1ntpdcmdoc) program running in @@ -541,7 +514,8 @@ even if not cryptographic authenticated. It should be understood that operating with the -auth flag disabled invites a significant vulnerability +auth +flag disabled invites a significant vulnerability where a rogue hacker can masquerade as a falseticker and seriously disrupt system timekeeping. @@ -557,10 +531,7 @@ the authentication process itself.

    An attractive alternative where multicast support is available is manycast mode, in which clients periodically troll for servers as described in the -AutomaticAutomatic -NTP -Configuration -Options +Automatic NTP Configuration Options page. Either symmetric key or public key cryptographic authentication can be used in this mode. @@ -576,20 +547,16 @@ both symmetric key and public key cryptography are summarized below; further details are in the briefings, papers and reports at the NTP project page linked from -.Li -http://www.ntp.org/ -. +http://www.ntp.org/.

    - +
    -

    Symmetric-Key

    +

    Symmetric-Key Cryptography

    -

    Symmetric-Key -Cryptography -The original RFC-1305 specification allows any one of possibly +

    The original RFC-1305 specification allows any one of possibly 65,534 keys, each distinguished by a 32-bit key identifier, to authenticate an association. The servers and clients involved must @@ -612,11 +579,13 @@ utility programs.

    When ntpd(1ntpdmdoc) is first started, it reads the key file specified in the -keys configuration command and installs the keys +keys +configuration command and installs the keys in the key cache. However, individual keys must be activated with the -trusted command before use. +trusted +command before use. This allows, for instance, the installation of possibly several batches of keys and @@ -626,24 +595,23 @@ remotely using This also provides a revocation capability that can be used if a key becomes compromised. The -requestkey command selects the key used as the password for the +requestkey +command selects the key used as the password for the ntpdc(1ntpdcmdoc) utility, while the -controlkey command selects the key used as the password for the +controlkey +command selects the key used as the password for the ntpq(1ntpqmdoc) utility.

    - +
    -

    Public

    +

    Public Key Cryptography

    -

    Public -Key -Cryptography -NTPv4 supports the original NTPv3 symmetric key scheme +

    NTPv4 supports the original NTPv3 symmetric key scheme described in RFC-1305 and in addition the Autokey protocol, which is based on public key cryptography. The Autokey Version 2 protocol described on the Autokey Protocol @@ -667,8 +635,7 @@ in which a pseudo-random key list is generated and used in reverse order. These schemes are described along with an executive summary, current status, briefing slides and reading list on the -AutonomousAutonomous -Authentication +Autonomous Authentication page.

    The specific cryptographic environment used by Autokey servers @@ -685,7 +652,8 @@ along with the matching sign key. There are several schemes available in the OpenSSL software library, each identified by a specific string such as -md5WithRSAEncryption, which stands for the MD5 message digest with RSA +md5WithRSAEncryption, +which stands for the MD5 message digest with RSA encryption scheme. The current NTP distribution supports all the schemes in the OpenSSL library, including @@ -705,16 +673,13 @@ the NTP subnet will form such that every group host can find a trail to at least one trusted host.

    - +
    -

    Naming

    +

    Naming and Addressing

    -

    Naming -and -Addressing -It is important to note that Autokey does not use DNS to +

    It is important to note that Autokey does not use DNS to resolve addresses, since DNS can't be completely trusted until the name servers have synchronized clocks. The cryptographic name used by Autokey to bind the host identity @@ -753,8 +718,7 @@ and corporate NTP servers are operated outside firewall perimeters.

    Operation

    -

    Operation -A specific combination of authentication scheme (none, +

    A specific combination of authentication scheme (none, symmetric key, public key) and identity scheme is called a cryptotype, although not all combinations are compatible. There may be management configurations where the clients, @@ -770,14 +734,20 @@ but may not represent good security practice. of mobilization, either at configuration time or some time later when a message of appropriate cryptotype arrives. When mobilized by a -server or -peer configuration command and no -key or -autokey subcommands are present, the association is not +server +or +peer +configuration command and no +key +or +autokey +subcommands are present, the association is not authenticated; if the -key subcommand is present, the association is authenticated +key +subcommand is present, the association is authenticated using the symmetric key ID specified; if the -autokey subcommand is present, the association is authenticated +autokey +subcommand is present, the association is authenticated using Autokey.

    When multiple identity schemes are supported in the Autokey @@ -817,7 +787,9 @@ authenticated with that key. If verification fails, Bob sends Cathy a thing called a crypto-NAK, which tells her something broke. -She can see the evidence using the ntpq program. +She can see the evidence using the +ntpq(1ntpqmdoc) +program.

    Denise has rolled her own host key and certificate. She also uses one of the identity schemes as Bob. @@ -836,15 +808,13 @@ combinations; for instance, running an identity scheme with one server and no authentication with another might not be wise.

    - +
    -

    Key

    +

    Key Management

    -

    Key -Management -The cryptographic values used by the Autokey protocol are +

    The cryptographic values used by the Autokey protocol are incorporated as a set of files generated by the ntp-keygen(1ntpkeygenmdoc) utility program, including symmetric key, host key and @@ -876,19 +846,18 @@ The certificate extension fields must not contain either a subject key identifier or a issuer key identifier field; however, an extended key usage field for a trusted host must contain the value -trustRoot;. Other extension fields are ignored. +trustRoot;. +Other extension fields are ignored.

    - +
    -

    Authentication

    +

    Authentication Commands

    -

    Authentication -Commands

    -
    Ic
    Specifies the interval between regenerations of the session key +
    autokey [logsec]
    Specifies the interval between regenerations of the session key list used with the Autokey protocol. Note that the size of the key list for each association depends on this interval and the current @@ -897,25 +866,16 @@ The default value is 12 (4096 s or about 1.1 hours). For poll intervals above the specified interval, a session key list with a single entry will be regenerated for every message sent. -
    Ic
    Specifies the key identifier to use with the +
    controlkey key
    Specifies the key identifier to use with the ntpq(1ntpqmdoc) utility, which uses the standard protocol defined in RFC-1305. The -key argument is +key +argument is the key identifier for a trusted key, where the value can be in the range 1 to 65,534, inclusive. -
    Xo
    [cert file ] -[leap file ] -[randfile file ] -[host file ] -[sign file ] -[gq file ] -[gqpar file ] -[iffpar file ] -[mvpar file ] -[pw password ] -This command requires the OpenSSL library. +
    crypto[cert file][leap file][randfile file][host file][sign file][gq file][gqpar file][iffpar file][mvpar file][pw password]
    This command requires the OpenSSL library. It activates public key cryptography, selects the message digest and signature encryption scheme and loads the required private and public @@ -925,58 +885,54 @@ the default names are used as described above. 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 command or default +keysdir +command or default /usr/local/etc. Following are the subcommands:
    -
    Cm
    Specifies the location of the required host public certificate file. +
    cert file
    Specifies the location of the required host public certificate file. This overrides the link -ntpkey_cert_NsArhostname +ntpkey_cert_hostname in the keys directory. -
    Cm
    Specifies the location of the optional GQ parameters file. +
    gqpar file
    Specifies the location of the optional GQ parameters file. This overrides the link -ntpkey_gq_NsArhostname +ntpkey_gq_hostname in the keys directory. -
    Cm
    Specifies the location of the required host key file. +
    host file
    Specifies the location of the required host key file. This overrides the link -ntpkey_key_NsArhostname +ntpkey_key_hostname in the keys directory. -
    Cm
    Specifies the location of the optional IFF parameters file.This +
    iffpar file
    Specifies the location of the optional IFF parameters file.This overrides the link -ntpkey_iff_NsArhostname +ntpkey_iff_hostname in the keys directory. -
    Cm
    Specifies the location of the optional leapsecond file. +
    leap file
    Specifies the location of the optional leapsecond file. This overrides the link ntpkey_leap in the keys directory. -
    Cm
    Specifies the location of the optional MV parameters file. +
    mvpar file
    Specifies the location of the optional MV parameters file. This overrides the link -ntpkey_mv_NsArhostname +ntpkey_mv_hostname in the keys directory. -
    Cm
    Specifies the password to decrypt files containing private keys and +
    pw password
    Specifies the password to decrypt files containing private keys and identity parameters. This is required only if these files have been encrypted. -
    Cm
    Specifies the location of the random seed file used by the OpenSSL +
    randfile file
    Specifies the location of the random seed file used by the OpenSSL library. The defaults are described in the main text above. -
    Cm
    Specifies the location of the optional sign key file. +
    sign file
    Specifies the location of the optional sign key file. This overrides the link -ntpkey_sign_NsArhostname +ntpkey_sign_hostname in the keys directory. If this file is not found, the host key is also the sign key.
    - .It -Ic -keys -Ar -keyfile -Specifies the complete path and location of the MD5 key file +
    keys keyfile
    Specifies the complete path and location of the MD5 key file containing the keys and key identifiers used by ntpd(1ntpdmdoc), ntpq(1ntpqmdoc) @@ -984,36 +940,23 @@ and ntpdc(1ntpdcmdoc) when operating with symmetric key cryptography. This is the same operation as the --k command line option. -.It -Ic -keysdir -Ar -path -This command specifies the default directory path for +-k +command line option. +
    keysdir path
    This command specifies the default directory path for cryptographic keys, parameters and certificates. The default is /usr/local/etc/. -.It -Ic -requestkey -Ar -key -Specifies the key identifier to use with the +
    requestkey key
    Specifies the key identifier to use with the ntpdc(1ntpdcmdoc) utility program, which uses a proprietary protocol specific to this implementation of ntpd(1ntpdmdoc). The -key argument is a key identifier +key +argument is a key identifier for the trusted key, where the value can be in the range 1 to 65,534, inclusive. -.It -Ic -revoke -Ar -logsec -Specifies the interval between re-randomization of certain +
    revoke logsec
    Specifies the interval between re-randomization of certain cryptographic values used by the Autokey scheme, as a power of 2 in seconds. These values need to be updated frequently in order to @@ -1023,13 +966,7 @@ The default interval is 16 (65,536 s or about 18 hours). For poll intervals above the specified interval, the values will be updated for every message sent. -.It -Ic -trustedkey -Ar -key -... -Specifies the key identifiers which are trusted for the +
    trustedkey key ...
    Specifies the key identifiers which are trusted for the purposes of authenticating peers with symmetric key cryptography, as well as keys used by the ntpq(1ntpqmdoc) @@ -1041,72 +978,70 @@ and remote servers share the same key and key identifier for this purpose, although different keys can be used with different servers. The -key arguments are 32-bit unsigned -integers with values from 1 to 65,534. - +key +arguments are 32-bit unsigned +integers with values from 1 to 65,534. +

    - +
    -

    Error

    +

    Error Codes

    -

    Error -Codes -The following error codes are reported via the NTP control +

    The following error codes are reported via the NTP control and monitoring protocol trap mechanism. -

    -
    101
    (bad field format or length) +
    +
    101
    (bad field format or length) The packet has invalid version, length or format. -
    102
    (bad timestamp) +
    102
    (bad timestamp) The packet timestamp is the same or older than the most recent received. This could be due to a replay or a server clock time step. -
    103
    (bad filestamp) +
    103
    (bad filestamp) The packet filestamp is the same or older than the most recent received. This could be due to a replay or a key file generation error. -
    104
    (bad or missing public key) +
    104
    (bad or missing public key) The public key is missing, has incorrect format or is an unsupported type. -
    105
    (unsupported digest type) +
    105
    (unsupported digest type) The server requires an unsupported digest/signature scheme. -
    106
    (mismatched digest types) +
    106
    (mismatched digest types) Not used. -
    107
    (bad signature length) +
    107
    (bad signature length) The signature length does not match the current public key. -
    108
    (signature not verified) +
    108
    (signature not verified) The message fails the signature check. It could be bogus or signed by a different private key. -
    109
    (certificate not verified) +
    109
    (certificate not verified) The certificate is invalid or signed with the wrong key. -
    110
    (certificate not verified) +
    110
    (certificate not verified) The certificate is not yet valid or has expired or the signature could not be verified. -
    111
    (bad or missing cookie) +
    111
    (bad or missing cookie) The cookie is missing, corrupted or bogus. -
    112
    (bad or missing leapseconds table) +
    112
    (bad or missing leapseconds table) The leapseconds table is missing, corrupted or bogus. -
    113
    (bad or missing certificate) +
    113
    (bad or missing certificate) The certificate is missing, corrupted or bogus. -
    114
    (bad or missing identity) +
    114
    (bad or missing identity) The identity key is missing, corrupt or bogus.
    -
    +

    - +
    -

    Monitoring

    +

    Monitoring Support

    -

    Monitoring -Support -ntpd(1ntpdmdoc) +

    ntpd(1ntpdmdoc) includes a comprehensive monitoring facility suitable for continuous, long term recording of server and client timekeeping performance. See the -statistics command below +statistics +command below for a listing and example of each type of statistics currently supported. Statistic files are managed using file generation sets @@ -1121,29 +1056,28 @@ jobs, the data can be automatically summarized and archived for retrospective analysis.

    - +
    -

    Monitoring

    +

    Monitoring Commands

    -

    Monitoring -Commands -

    -
    Ic
    Enables writing of statistics records. +
    +
    statistics name ...
    Enables writing of statistics records. Currently, four kinds of -name statistics are supported. -
    -
    Cm
    Enables recording of clock driver statistics information. +name +statistics are supported. +
    +
    clockstats
    Enables recording of clock driver statistics information. Each update received from a clock driver appends a line of the following form to the file generation set named -clockstats: .Bd --literal -49213 525.624 127.127.4.1 93 226 00:08:29.606 D -.Ed +clockstats: +
              
+          49213 525.624 127.127.4.1 93 226 00:08:29.606 D
+
    -

    The first two fields show the date (Modified Julian Day) and time +

    The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next field shows the clock address in dotted-quad notation. @@ -1154,53 +1088,52 @@ In some clock drivers a good deal of additional information can be gathered and displayed as well. See information specific to each clock for further details. -

    Cm
    This option requires the OpenSSL cryptographic software library. +
    cryptostats
    This option requires the OpenSSL cryptographic software library. It enables recording of cryptographic public key protocol information. Each message received by the protocol module appends a line of the following form to the file generation set named -cryptostats: .Bd --literal -49213 525.624 127.127.4.1 message -.Ed +cryptostats: +
              
+          49213 525.624 127.127.4.1 message
+
    -

    The first two fields show the date (Modified Julian Day) and time +

    The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next field shows the peer address in dotted-quad notation, The final message field includes the message type and certain ancillary information. See the -AuthenticationAuthentication -Options +Authentication Options section for further information. -

    Cm
    Enables recording of loop filter statistics information. +
    loopstats
    Enables recording of loop filter statistics information. Each update of the local clock outputs a line of the following form to the file generation set named -loopstats: .Bd --literal -50935 75440.031 0.000006019 13.778190 0.000351733 0.0133806 -.Ed +loopstats: +
              
+          50935 75440.031 0.000006019 13.778190 0.000351733 0.0133806
+
    -

    The first two fields show the date (Modified Julian Day) and +

    The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next five fields show time offset (seconds), frequency offset (parts per million - PPM), RMS jitter (seconds), Allan deviation (PPM) and clock discipline time constant. -

    Cm
    Enables recording of peer statistics information. +
    peerstats
    Enables recording of peer statistics information. This includes statistics records of all peers of a NTP server and of special signals, where present and configured. Each valid update appends a line of the following form to the current element of a file generation set named -peerstats: .Bd --literal -48773 10847.650 127.127.4.1 9714 -0.001605376 0.000000000 0.001424877 0.000958674 -.Ed +peerstats: +
              
+          48773 10847.650 127.127.4.1 9714 -0.001605376 0.000000000 0.001424877 0.000958674
+
    -

    The first two fields show the date (Modified Julian Day) and +

    The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next two fields show the peer address in dotted-quad notation and status, @@ -1209,19 +1142,19 @@ The status field is encoded in hex in the format described in Appendix A of the NTP specification RFC 1305. The final four fields show the offset, delay, dispersion and RMS jitter, all in seconds. -

    Cm
    Enables recording of raw-timestamp statistics information. +
    rawstats
    Enables recording of raw-timestamp statistics information. This includes statistics records of all peers of a NTP server and of special signals, where present and configured. Each NTP message received from a peer or clock driver appends a line of the following form to the file generation set named -rawstats: .Bd --literal -50928 2132.543 128.4.1.1 128.4.1.20 3102453281.584327000 3102453281.58622800031 02453332.540806000 3102453332.541458000 -.Ed +rawstats: +
              
+          50928 2132.543 128.4.1.1 128.4.1.20 3102453281.584327000 3102453281.58622800031 02453332.540806000 3102453332.541458000
+
    -

    The first two fields show the date (Modified Julian Day) and +

    The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next two fields show the remote peer or clock address followed by the local address @@ -1231,54 +1164,45 @@ receive, transmit and final NTP timestamps in order. The timestamp values are as received and before processing by the various data smoothing and mitigation algorithms. -

    Cm
    Enables recording of ntpd statistics counters on a periodic basis. +
    sysstats
    Enables recording of ntpd statistics counters on a periodic basis. Each hour a line of the following form is appended to the file generation set named -sysstats: .Bd --literal -50928 2132.543 36000 81965 0 9546 56 71793 512 540 10 147 -.Ed +sysstats: +
              
+          50928 2132.543 36000 81965 0 9546 56 71793 512 540 10 147
+
    -

    The first two fields show the date (Modified Julian Day) and time +

    The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The remaining ten fields show the statistics counter values accumulated since the last generated line. -

    -
    Time
    Time in hours since the system was last rebooted. -
    Packets
    Total number of packets received. -
    Packets
    Number of packets received in response to previous packets sent -
    Current
    Number of packets matching the current NTP version. -
    Previous
    Number of packets matching the previous NTP version. -
    Bad
    Number of packets matching neither NTP version. -
    Access
    Number of packets denied access for any reason. -
    Bad
    Number of packets with invalid length, format or port number. -
    Bad
    Number of packets not verified as authentic. -
    Rate
    Number of packets discarded due to rate limitation. +
    +
    Time since restart 36000
    Time in hours since the system was last rebooted. +
    Packets received 81965
    Total number of packets received. +
    Packets processed 0
    Number of packets received in response to previous packets sent +
    Current version 9546
    Number of packets matching the current NTP version. +
    Previous version 56
    Number of packets matching the previous NTP version. +
    Bad version 71793
    Number of packets matching neither NTP version. +
    Access denied 512
    Number of packets denied access for any reason. +
    Bad length or format 540
    Number of packets with invalid length, format or port number. +
    Bad authentication 10
    Number of packets not verified as authentic. +
    Rate exceeded 147
    Number of packets discarded due to rate limitation.
    - .It -Cm -statsdir -Ar -directory_path -Indicates the full path of a directory where statistics files +
    statsdir directory_path
    Indicates the full path of a directory where statistics files should be created (see below). This keyword allows the (otherwise constant) -filegen filename prefix to be modified for file generation sets, which +filegen +filename prefix to be modified for file generation sets, which is useful for handling statistics logs. -.It -Cm -filegen -Ar -name -Xo -[file filename ] -[type typename ] -[link | nolink ] -[enable | disable ] -Configures setting of generation file set name. +
    filegen name
    [filefilename] +[typetypename] +[link|nolink] +[enable|disable] + +

    Configures setting of generation file set name. Generation file sets provide a means for handling files that are continuously growing during the lifetime of a server. @@ -1295,57 +1219,69 @@ operations without the risk of disturbing the operation of ntpd. (Most important: they can be removed to free space for new data produced.) -

    Note that this command can be sent from the +

    Note that this command can be sent from the ntpdc(1ntpdcmdoc) program running at a remote location. -

    -
    Cm
    This is the type of the statistics records, as shown in the -statistics command. -
    Cm
    This is the file name for the statistics records. +
    +name +This is the type of the statistics records, as shown in the +statistics +command. +filefilename +This is the file name for the statistics records. Filenames of set members are built from three concatenated elements -Cm prefix, Cm filename and -Cm suffix: -
    -
    Cm
    This is a constant filename path. +Cmprefix, +Cmfilename +and +Cmsuffix: +
    +prefix +This is a constant filename path. It is not subject to modifications via the -filegen option. +filegen +option. It is defined by the server, usually specified as a compile-time constant. It may, however, be configurable for individual file generation sets via other commands. For example, the prefix used with -loopstats and -peerstats generation can be configured using the -statsdir option explained above. -
    Cm
    This string is directly concatenated to the prefix mentioned +loopstats +and +peerstats +generation can be configured using the +statsdir +option explained above. +filename +This string is directly concatenated to the prefix mentioned above (no intervening /). This can be modified using the file argument to the -filegen statement. +filegen +statement. No .. elements are allowed in this component to prevent filenames referring to parts outside the filesystem hierarchy denoted by -prefix.
    Cm
    This part is reflects individual elements of a file set. +prefix. +suffix +This part is reflects individual elements of a file set. It is generated according to the type of a file set.
    - .It -Cm -type -Ar -typename + typetypename A file generation set is characterized by its type. The following types are supported: -
    -
    Cm
    The file set is actually a single plain file. -
    Cm
    One element of file set is used per incarnation of a ntpd +
    +none +The file set is actually a single plain file. +pid +One element of file set is used per incarnation of a ntpd server. This type does not perform any changes to file set members during runtime, however it provides an easy way of @@ -1353,100 +1289,105 @@ separating files belonging to different ntpd(1ntpdmdoc) server incarnations. The set member filename is built by appending a -\&. +. to concatenated -prefix and -filename strings, and +prefix +and +filename +strings, and appending the decimal representation of the process ID of the ntpd(1ntpdmdoc) server process. -
    Cm
    One file generation set element is created per day. +day +One file generation set element is created per day. A day is defined as the period between 00:00 and 24:00 UTC. The file set member suffix consists of a -\&. +. and a day specification in the form -YYYYMMdd. YYYY is a 4-digit year number (e.g., 1992). -MM is a two digit month number. -dd is a two digit day number. +YYYYMMdd. +YYYY +is a 4-digit year number (e.g., 1992). +MM +is a two digit month number. +dd +is a two digit day number. Thus, all information written at 10 December 1992 would end up in a file named -prefix filename Ns .19921210.
    Cm
    Any file set member contains data related to a certain week of +prefix +filenameNs.19921210. +week +Any file set member contains data related to a certain week of a year. The term week is defined by computing day-of-year modulo 7. Elements of such a file generation set are distinguished by appending the following suffix to the file set filename base: A dot, a 4-digit year number, the letter -W, and a 2-digit week number. +W, +and a 2-digit week number. For example, information from January, 10th 1992 would end up in a file with suffix -.No -. -Ns -Ar -1992W1 -. -
    Cm
    One generation file set element is generated per month. +No.1992W1. +month +One generation file set element is generated per month. The file name suffix consists of a dot, a 4-digit year number, and a 2-digit month. -
    Cm
    One generation file element is generated per year. +year +One generation file element is generated per year. The filename suffix consists of a dot and a 4 digit year number. -
    Cm
    This type of file generation sets changes to a new element of +age +This type of file generation sets changes to a new element of the file set every 24 hours of server operation. The filename suffix consists of a dot, the letter -a, and an 8-digit number. +a, +and an 8-digit number. This number is taken to be the number of seconds the server is running at the start of the corresponding 24-hour period. Information is only written to a file generation by specifying -enable; output is prevented by specifying -disable.
    - .It -Cm -link -| -nolink +enable; +output is prevented by specifying +disable. +
    + link|nolink It is convenient to be able to access the current element of a file generation set by a fixed name. This feature is enabled by specifying -link and disabled using -nolink. If link is specified, a +link +and disabled using +nolink. +If link is specified, a hard link from the current file set element to a file without suffix is created. When there is already a file with this name and the number of links of this file is one, it is renamed appending a dot, the letter -C, and the pid of the ntpd server process. +C, +and the pid of the ntpd server process. When the number of links is greater than one, the file is unlinked. This allows the current file to be accessed by a constant name. -.It -Cm -enable -\&| -Cm -disable -Enables or disables the recording function. - +enable|Cmdisable +Enables or disables the recording function. +
    +
    +

    - +
    -

    Access

    +

    Access Control Support

    -

    Access -Control -Support -The +

    The ntpd(1ntpdmdoc) daemon implements a general purpose address/mask based restriction list. @@ -1459,13 +1400,13 @@ The list is searched in order with the last match found defining the restriction flags associated with the entry. Additional information and examples can be found in the -"Notes on Configuring NTP and Setting up a NTP Subnet" +"NotesonConfiguringNTPandSettingupaNTPSubnet" page (available as part of the HTML documentation provided in /usr/share/doc/ntp). -

    The restriction facility was implemented in conformance +

    The restriction facility was implemented in conformance with the access policies for the original NSFnet backbone time servers. Later the facility was expanded to deflect @@ -1477,7 +1418,7 @@ an alternative to the NTP authentication facilities. Source address based restrictions are easily circumvented by a determined cracker. -

    Clients can be denied service because they are explicitly +

    Clients can be denied service because they are explicitly included in the restrict list created by the restrict command or implicitly as the result of cryptographic or rate limit violations. @@ -1494,16 +1435,13 @@ for an indefinate period, the only way at present to remove the restrictions is by restarting the server.

    - +
    -

    The

    +

    The Kiss-of-Death Packet

    -

    The -Kiss-of-Death -Packet -Ordinarily, packets denied service are simply dropped with no +

    Ordinarily, packets denied service are simply dropped with no further action except incrementing statistics counters. Sometimes a more proactive response is needed, such as a server message that @@ -1515,14 +1453,17 @@ KoD packets have the leap bits set unsynchronized and stratum set to zero and the reference identifier field set to a four-byte ASCII code. If the -noserve or -notrust flag of the matching restrict list entry is set, +noserve +or +notrust +flag of the matching restrict list entry is set, the code is "DENY"; if the -limited flag is set and the rate limit +limited +flag is set and the rate limit is exceeded, the code is "RATE". Finally, if a cryptographic violation occurs, the code is "CRYP". -

    A client receiving a KoD performs a set of sanity checks to +

    A client receiving a KoD performs a set of sanity checks to minimize security exposure, then updates the stratum and reference identifier peer variables, sets the access denied (TEST4) bit in the peer flash variable and sends @@ -1536,51 +1477,57 @@ happens automatically at the client when the association times out. It will happen at the server only if the server operator cooperates.

    - +
    -

    Access

    +

    Access Control Commands

    -

    Access -Control -Commands -

    -
    Xo
    [average avg ] -[minimum min ] -[monitor prob ] +
    +discard[averageavg][minimummin][monitorprob] Set the parameters of the -limited facility which protects the server from +limited +facility which protects the server from client abuse. The -average subcommand specifies the minimum average packet +average +subcommand specifies the minimum average packet spacing, while the -minimum subcommand specifies the minimum packet spacing. +minimum +subcommand specifies the minimum packet spacing. Packets that violate these minima are discarded and a kiss-o'-death packet returned if enabled. The default minimum average and minimum are 5 and 2, respectively. The monitor subcommand specifies the probability of discard for packets that overflow the rate-control window. -
    Xo
    [mask mask ] -[flag ... ] +restrictaddress[maskmask][flag...] The -address argument expressed in +address +argument expressed in dotted-quad form is the address of a host or network. Alternatively, the -address argument can be a valid host DNS name. +address +argument can be a valid host DNS name. The -mask argument expressed in dotted-quad form defaults to -255.255.255.255, meaning that the -address is treated as the address of an individual host. +mask +argument expressed in dotted-quad form defaults to +255.255.255.255, +meaning that the +address +is treated as the address of an individual host. A default entry (address -0.0.0.0, mask -0.0.0.0) is always included and is always the first entry in the list. +0.0.0.0, +mask +0.0.0.0) +is always included and is always the first entry in the list. Note that text string -default, with no mask option, may +default, +with no mask option, may be used to indicate the default entry. In the current implementation, -flag always +flag +always restricts access, i.e., an entry with no flags indicates that free access to the server is to be given. The flags are not orthogonal, @@ -1592,1148 +1539,3 @@ restrict informational queries and attempts to do run-time reconfiguration of the server. One or more of the following flags may be specified: -
    -
    Cm
    Deny packets of all kinds, including -ntpq(1ntpqmdoc) -and -ntpdc(1ntpdcmdoc) -queries. -
    Cm
    If this flag is set when an access violation occurs, a kiss-o'-death -(KoD) packet is sent. -KoD packets are rate limited to no more than one -per second. -If another KoD packet occurs within one second after the -last one, the packet is dropped. -
    Cm
    Deny service if the packet spacing violates the lower limits specified -in the discard command. -A history of clients is kept using the -monitoring capability of -ntpd(1ntpdmdoc). -Thus, monitoring is always active as -long as there is a restriction entry with the -limited flag. -
    Cm
    Declare traps set by matching hosts to be low priority. -The -number of traps a server can maintain is limited (the current limit -is 3). -Traps are usually assigned on a first come, first served -basis, with later trap requestors being denied service. -This flag -modifies the assignment algorithm by allowing low priority traps to -be overridden by later requests for normal priority traps. -
    Cm
    Deny -ntpq(1ntpqmdoc) -and -ntpdc(1ntpdcmdoc) -queries which attempt to modify the state of the -server (i.e., run time reconfiguration). -Queries which return -information are permitted. -
    Cm
    Deny -ntpq(1ntpqmdoc) -and -ntpdc(1ntpdcmdoc) -queries. -Time service is not affected. -
    Cm
    Deny packets which would result in mobilizing a new association. -This -includes broadcast and symmetric active packets when a configured -association does not exist. -
    Cm
    Deny all packets except -ntpq(1ntpqmdoc) -and -ntpdc(1ntpdcmdoc) -queries. -
    Cm
    Decline to provide mode 6 control message trap service to matching -hosts. -The trap service is a subsystem of the ntpdq control message -protocol which is intended for use by remote event logging programs. -
    Cm
    Deny service unless the packet is cryptographically authenticated. -
    Cm
    This is actually a match algorithm modifier, rather than a -restriction flag. -Its presence causes the restriction entry to be -matched only if the source port in the packet is the standard NTP -UDP port (123). -Both -ntpport and -non-ntpport may -be specified. -The -ntpport is considered more specific and -is sorted later in the list. -
    Cm
    Deny packets that do not match the current NTP version. -
    - -

    Default restriction list entries with the flags ignore, interface, -ntpport, for each of the local host's interface addresses are -inserted into the table at startup to prevent the server -from attempting to synchronize to its own time. -A default entry is also always present, though if it is -otherwise unconfigured; no flags are associated -with the default entry (i.e., everything besides your own -NTP server is unrestricted). - -

    -

    - -
    -
    - -

    Automatic

    - -

    Automatic -NTP -Configuration -Options -

    -

    - -
    -
    - -

    Manycasting

    - -

    Manycasting -Manycasting is a automatic discovery and configuration paradigm -new to NTPv4. -It is intended as a means for a multicast client -to troll the nearby network neighborhood to find cooperating -manycast servers, validate them using cryptographic means -and evaluate their time values with respect to other servers -that might be lurking in the vicinity. -The intended result is that each manycast client mobilizes -client associations with some number of the "best" -of the nearby manycast servers, yet automatically reconfigures -to sustain this number of servers should one or another fail. - -

    Note that the manycasting paradigm does not coincide -with the anycast paradigm described in RFC-1546, -which is designed to find a single server from a clique -of servers providing the same service. -The manycast paradigm is designed to find a plurality -of redundant servers satisfying defined optimality criteria. - -

    Manycasting can be used with either symmetric key -or public key cryptography. -The public key infrastructure (PKI) -offers the best protection against compromised keys -and is generally considered stronger, at least with relatively -large key sizes. -It is implemented using the Autokey protocol and -the OpenSSL cryptographic library available from -.Li -http://www.openssl.org/ -. -The library can also be used with other NTPv4 modes -as well and is highly recommended, especially for broadcast modes. - -

    A persistent manycast client association is configured -using the manycastclient command, which is similar to the -server command but with a multicast (IPv4 class -D or IPv6 prefix -FF) group address. -The IANA has designated IPv4 address 224.1.1.1 -and IPv6 address FF05::101 (site local) for NTP. -When more servers are needed, it broadcasts manycast -client messages to this address at the minimum feasible rate -and minimum feasible time-to-live (TTL) hops, depending -on how many servers have already been found. -There can be as many manycast client associations -as different group address, each one serving as a template -for a future ephemeral unicast client/server association. - -

    Manycast servers configured with the -manycastserver command listen on the specified group address for manycast -client messages. -Note the distinction between manycast client, -which actively broadcasts messages, and manycast server, -which passively responds to them. -If a manycast server is -in scope of the current TTL and is itself synchronized -to a valid source and operating at a stratum level equal -to or lower than the manycast client, it replies to the -manycast client message with an ordinary unicast server message. - -

    The manycast client receiving this message mobilizes -an ephemeral client/server association according to the -matching manycast client template, but only if cryptographically -authenticated and the server stratum is less than or equal -to the client stratum. -Authentication is explicitly required -and either symmetric key or public key (Autokey) can be used. -Then, the client polls the server at its unicast address -in burst mode in order to reliably set the host clock -and validate the source. -This normally results -in a volley of eight client/server at 2-s intervals -during which both the synchronization and cryptographic -protocols run concurrently. -Following the volley, -the client runs the NTP intersection and clustering -algorithms, which act to discard all but the "best" -associations according to stratum and synchronization -distance. -The surviving associations then continue -in ordinary client/server mode. - -

    The manycast client polling strategy is designed to reduce -as much as possible the volume of manycast client messages -and the effects of implosion due to near-simultaneous -arrival of manycast server messages. -The strategy is determined by the -manycastclient, tos and -ttl configuration commands. -The manycast poll interval is -normally eight times the system poll interval, -which starts out at the -minpoll value specified in the -manycastclient, command and, under normal circumstances, increments to the -maxpolll value specified in this command. -Initially, the TTL is -set at the minimum hops specified by the ttl command. -At each retransmission the TTL is increased until reaching -the maximum hops specified by this command or a sufficient -number client associations have been found. -Further retransmissions use the same TTL. - -

    The quality and reliability of the suite of associations -discovered by the manycast client is determined by the NTP -mitigation algorithms and the -minclock and -minsane values specified in the -tos configuration command. -At least -minsane candidate servers must be available and the mitigation -algorithms produce at least -minclock survivors in order to synchronize the clock. -Byzantine agreement principles require at least four -candidates in order to correctly discard a single falseticker. -For legacy purposes, -minsane defaults to 1 and -minclock defaults to 3. -For manycast service -minsane should be explicitly set to 4, assuming at least that -number of servers are available. - -

    If at least -minclock servers are found, the manycast poll interval is immediately -set to eight times -maxpoll. If less than -minclock servers are found when the TTL has reached the maximum hops, -the manycast poll interval is doubled. -For each transmission -after that, the poll interval is doubled again until -reaching the maximum of eight times -maxpoll. Further transmissions use the same poll interval and -TTL values. -Note that while all this is going on, -each client/server association found is operating normally -it the system poll interval. - -

    Administratively scoped multicast boundaries are normally -specified by the network router configuration and, -in the case of IPv6, the link/site scope prefix. -By default, the increment for TTL hops is 32 starting -from 31; however, the -ttl configuration command can be -used to modify the values to match the scope rules. - -

    It is often useful to narrow the range of acceptable -servers which can be found by manycast client associations. -Because manycast servers respond only when the client -stratum is equal to or greater than the server stratum, -primary (stratum 1) servers fill find only primary servers -in TTL range, which is probably the most common objective. -However, unless configured otherwise, all manycast clients -in TTL range will eventually find all primary servers -in TTL range, which is probably not the most common -objective in large networks. -The -tos command can be used to modify this behavior. -Servers with stratum below -floor or above -ceiling specified in the -tos command are strongly discouraged during the selection -process; however, these servers may be temporally -accepted if the number of servers within TTL range is -less than -minclock. -The above actions occur for each manycast client message, -which repeats at the designated poll interval. -However, once the ephemeral client association is mobilized, -subsequent manycast server replies are discarded, -since that would result in a duplicate association. -If during a poll interval the number of client associations -falls below -minclock, all manycast client prototype associations are reset -to the initial poll interval and TTL hops and operation -resumes from the beginning. -It is important to avoid -frequent manycast client messages, since each one requires -all manycast servers in TTL range to respond. -The result could well be an implosion, either minor or major, -depending on the number of servers in range. -The recommended value for -maxpoll is 12 (4,096 s). - -

    It is possible and frequently useful to configure a host -as both manycast client and manycast server. -A number of hosts configured this way and sharing a common -group address will automatically organize themselves -in an optimum configuration based on stratum and -synchronization distance. -For example, consider an NTP -subnet of two primary servers and a hundred or more -dependent clients. -With two exceptions, all servers -and clients have identical configuration files including both -multicastclient and -multicastserver commands using, for instance, multicast group address -239.1.1.1. -The only exception is that each primary server -configuration file must include commands for the primary -reference source such as a GPS receiver. - -

    The remaining configuration files for all secondary -servers and clients have the same contents, except for the -tos command, which is specific for each stratum level. -For stratum 1 and stratum 2 servers, that command is -not necessary. -For stratum 3 and above servers the -floor value is set to the intended stratum number. -Thus, all stratum 3 configuration files are identical, -all stratum 4 files are identical and so forth. - -

    Once operations have stabilized in this scenario, -the primary servers will find the primary reference source -and each other, since they both operate at the same -stratum (1), but not with any secondary server or client, -since these operate at a higher stratum. -The secondary -servers will find the servers at the same stratum level. -If one of the primary servers loses its GPS receiver, -it will continue to operate as a client and other clients -will time out the corresponding association and -re-associate accordingly. - -

    Some administrators prefer to avoid running -ntpd(1ntpdmdoc) -continuously and run either -ntpdate(8) -or -ntpd(1ntpdmdoc) --q as a cron job. -In either case the servers must be -configured in advance and the program fails if none are -available when the cron job runs. -A really slick -application of manycast is with -ntpd(1ntpdmdoc) --q. The program wakes up, scans the local landscape looking -for the usual suspects, selects the best from among -the rascals, sets the clock and then departs. -Servers do not have to be configured in advance and -all clients throughout the network can have the same -configuration file. -

    -

    - -
    -
    - -

    Manycast

    - -

    Manycast -Interactions -with -Autokey -Each time a manycast client sends a client mode packet -to a multicast group address, all manycast servers -in scope generate a reply including the host name -and status word. -The manycast clients then run -the Autokey protocol, which collects and verifies -all certificates involved. -Following the burst interval -all but three survivors are cast off, -but the certificates remain in the local cache. -It often happens that several complete signing trails -from the client to the primary servers are collected in this way. - -

    About once an hour or less often if the poll interval -exceeds this, the client regenerates the Autokey key list. -This is in general transparent in client/server mode. -However, about once per day the server private value -used to generate cookies is refreshed along with all -manycast client associations. -In this case all -cryptographic values including certificates is refreshed. -If a new certificate has been generated since -the last refresh epoch, it will automatically revoke -all prior certificates that happen to be in the -certificate cache. -At the same time, the manycast -scheme starts all over from the beginning and -the expanding ring shrinks to the minimum and increments -from there while collecting all servers in scope. -

    -

    - -
    -
    - -

    Manycast

    - -

    Manycast -Options -

    -
    Xo
    .Oo -ceiling ceiling | cohort 0 | 1 | floor floor | minclock minclock | minsane minsane .Oc -This command affects the clock selection and clustering -algorithms. -It can be used to select the quality and -quantity of peers used to synchronize the system clock -and is most useful in manycast mode. -The variables operate -as follows: -
    -
    Cm
    Peers with strata above -ceiling will be discarded if there are at least -minclock peers remaining. -This value defaults to 15, but can be changed -to any number from 1 to 15. -
    Cm
    This is a binary flag which enables (0) or disables (1) -manycast server replies to manycast clients with the same -stratum level. -This is useful to reduce implosions where -large numbers of clients with the same stratum level -are present. -The default is to enable these replies. -
    Cm
    Peers with strata below -floor will be discarded if there are at least -minclock peers remaining. -This value defaults to 1, but can be changed -to any number from 1 to 15. -
    Cm
    The clustering algorithm repeatedly casts out outlyer -associations until no more than -minclock associations remain. -This value defaults to 3, -but can be changed to any number from 1 to the number of -configured sources. -
    Cm
    This is the minimum number of candidates available -to the clock selection algorithm in order to produce -one or more truechimers for the clustering algorithm. -If fewer than this number are available, the clock is -undisciplined and allowed to run free. -The default is 1 -for legacy purposes. -However, according to principles of -Byzantine agreement, -minsane should be at least 4 in order to detect and discard -a single falseticker. -
    - .It -Cm -ttl -Ar -hop -... -This command specifies a list of TTL values in increasing -order, up to 8 values can be specified. -In manycast mode these values are used in turn -in an expanding-ring search. -The default is eight -multiples of 32 starting at 31. - -
    -

    - -
    -
    - -

    Reference

    - -

    Reference -Clock -Support -The NTP Version 4 daemon supports some three dozen different radio, -satellite and modem reference clocks plus a special pseudo-clock -used for backup or when no other clock source is available. -Detailed descriptions of individual device drivers and options can -be found in the -"Reference Clock Drivers" -page -(available as part of the HTML documentation -provided in -/usr/share/doc/ntp). -Additional information can be found in the pages linked -there, including the -"Debugging Hints for Reference Clock Drivers" -and -"How To Write a Reference Clock Driver" -pages -(available as part of the HTML documentation -provided in -/usr/share/doc/ntp). -In addition, support for a PPS -signal is available as described in the -"Pulse-per-second (PPS) Signal Interfacing" -page -(available as part of the HTML documentation -provided in -/usr/share/doc/ntp). -Many -drivers support special line discipline/streams modules which can -significantly improve the accuracy using the driver. -These are -described in the -"Line Disciplines and Streams Drivers" -page -(available as part of the HTML documentation -provided in -/usr/share/doc/ntp). - -

    A reference clock will generally (though not always) be a radio -timecode receiver which is synchronized to a source of standard -time such as the services offered by the NRC in Canada and NIST and -USNO in the US. -The interface between the computer and the timecode -receiver is device dependent, but is usually a serial port. -A -device driver specific to each reference clock must be selected and -compiled in the distribution; however, most common radio, satellite -and modem clocks are included by default. -Note that an attempt to -configure a reference clock when the driver has not been compiled -or the hardware port has not been appropriately configured results -in a scalding remark to the system log file, but is otherwise non -hazardous. - -

    For the purposes of configuration, -ntpd(1ntpdmdoc) -treats -reference clocks in a manner analogous to normal NTP peers as much -as possible. -Reference clocks are identified by a syntactically -correct but invalid IP address, in order to distinguish them from -normal NTP peers. -Reference clock addresses are of the form -.Sm -off -.Li -127.127. -Ar -t -. -Ar -u -, -.Sm -on -where -t is an integer -denoting the clock type and -u indicates the unit -number in the range 0-3. -While it may seem overkill, it is in fact -sometimes useful to configure multiple reference clocks of the same -type, in which case the unit numbers must be unique. - -

    The -server command is used to configure a reference -clock, where the -address argument in that command -is the clock address. -The -key, version and -ttl options are not used for reference clock support. -The -mode option is added for reference clock support, as -described below. -The -prefer option can be useful to -persuade the server to cherish a reference clock with somewhat more -enthusiasm than other reference clocks or peers. -Further -information on this option can be found in the -"Mitigation Rules and the prefer Keyword" -(available as part of the HTML documentation -provided in -/usr/share/doc/ntp) -page. -The -minpoll and -maxpoll options have -meaning only for selected clock drivers. -See the individual clock -driver document pages for additional information. - -

    The -fudge command is used to provide additional -information for individual clock drivers and normally follows -immediately after the -server command. -The -address argument specifies the clock address. -The -refid and -stratum options can be used to -override the defaults for the device. -There are two optional -device-dependent time offsets and four flags that can be included -in the -fudge command as well. - -

    The stratum number of a reference clock is by default zero. -Since the -ntpd(1ntpdmdoc) -daemon adds one to the stratum of each -peer, a primary server ordinarily displays an external stratum of -one. -In order to provide engineered backups, it is often useful to -specify the reference clock stratum as greater than zero. -The -stratum option is used for this purpose. -Also, in cases -involving both a reference clock and a pulse-per-second (PPS) -discipline signal, it is useful to specify the reference clock -identifier as other than the default, depending on the driver. -The -refid option is used for this purpose. -Except where noted, -these options apply to all clock drivers. -

    -

    - -
    -
    - -

    Reference

    - -

    Reference -Clock -Commands -

    -
    Xo
    .Sm -off -.Li -127.127. -Ar -t -. -Ar -u -.Sm -on -[prefer ] -[mode int ] -[minpoll int ] -[maxpoll int ] -This command can be used to configure reference clocks in -special ways. -The options are interpreted as follows: -
    -
    Cm
    Marks the reference clock as preferred. -All other things being -equal, this host will be chosen for synchronization among a set of -correctly operating hosts. -See the -"Mitigation Rules and the prefer Keyword" -page -(available as part of the HTML documentation -provided in -/usr/share/doc/ntp) -for further information. -
    Cm
    Specifies a mode number which is interpreted in a -device-specific fashion. -For instance, it selects a dialing -protocol in the ACTS driver and a device subtype in the -parse -drivers. -
    Cm
    Cm
    These options specify the minimum and maximum polling interval -for reference clock messages, as a power of 2 in seconds -For -most directly connected reference clocks, both -minpoll and -maxpoll default to 6 (64 s). -For modem reference clocks, -minpoll defaults to 10 (17.1 m) and -maxpoll defaults to 14 (4.5 h). -The allowable range is 4 (16 s) to 17 (36.4 h) inclusive. -
    - .It -Xo -Ic -fudge -.Sm -off -.Li -127.127. -Ar -t -. -Ar -u -.Sm -on -[time1 sec ] -[time2 sec ] -[stratum int ] -[refid string ] -[mode int ] -[flag1 Cm 0 \&| Cm 1 ] -[flag2 Cm 0 \&| Cm 1 ] -[flag3 Cm 0 \&| Cm 1 ] -[flag4 Cm 0 \&| Cm 1 ] -This command can be used to configure reference clocks in -special ways. -It must immediately follow the -server command which configures the driver. -Note that the same capability -is possible at run time using the -ntpdc(1ntpdcmdoc) -program. -The options are interpreted as -follows: -
    -
    Cm
    Specifies a constant to be added to the time offset produced by -the driver, a fixed-point decimal number in seconds. -This is used -as a calibration constant to adjust the nominal time offset of a -particular clock to agree with an external standard, such as a -precision PPS signal. -It also provides a way to correct a -systematic error or bias due to serial port or operating system -latencies, different cable lengths or receiver internal delay. -The -specified offset is in addition to the propagation delay provided -by other means, such as internal DIPswitches. -Where a calibration -for an individual system and driver is available, an approximate -correction is noted in the driver documentation pages. -Note: in order to facilitate calibration when more than one -radio clock or PPS signal is supported, a special calibration -feature is available. -It takes the form of an argument to the -enable command described in -MiscellaneousMiscellaneous -Options -page and operates as described in the -"Reference Clock Drivers" -page -(available as part of the HTML documentation -provided in -/usr/share/doc/ntp). -
    Cm
    Specifies a fixed-point decimal number in seconds, which is -interpreted in a driver-dependent way. -See the descriptions of -specific drivers in the -"Reference Clock Drivers" -page -(available as part of the HTML documentation -provided in -/usr/share/doc/ntp). -
    Cm
    Specifies the stratum number assigned to the driver, an integer -between 0 and 15. -This number overrides the default stratum number -ordinarily assigned by the driver itself, usually zero. -
    Cm
    Specifies an ASCII string of from one to four characters which -defines the reference identifier used by the driver. -This string -overrides the default identifier ordinarily assigned by the driver -itself. -
    Cm
    Specifies a mode number which is interpreted in a -device-specific fashion. -For instance, it selects a dialing -protocol in the ACTS driver and a device subtype in the -parse -drivers. -
    Cm
    Cm
    Cm
    Cm
    These four flags are used for customizing the clock driver. -The -interpretation of these values, and whether they are used at all, -is a function of the particular clock driver. -However, by -convention -flag4 is used to enable recording monitoring -data to the -clockstats file configured with the -filegen command. -Further information on the -filegen command can be found in -MonitoringMonitoring -Options -. -
    - -
    -

    - -
    -
    - -

    Miscellaneous

    - -

    Miscellaneous -Options -

    -
    Ic
    The broadcast and multicast modes require a special calibration -to determine the network delay between the local and remote -servers. -Ordinarily, this is done automatically by the initial -protocol exchanges between the client and server. -In some cases, -the calibration procedure may fail due to network or server access -controls, for example. -This command specifies the default delay to -be used under these circumstances. -Typically (for Ethernet), a -number between 0.003 and 0.007 seconds is appropriate. -The default -when this command is not used is 0.004 seconds. -
    Ic
    This option controls the delay in seconds between the first and second -packets sent in burst or iburst mode to allow additional time for a modem -or ISDN call to complete. -
    Ic
    This command specifies the complete path and name of the file used to -record the frequency of the local clock oscillator. -This is the same -operation as the --f command line option. -If the file exists, it is read at -startup in order to set the initial frequency and then updated once per -hour with the current frequency computed by the daemon. -If the file name is -specified, but the file itself does not exist, the starts with an initial -frequency of zero and creates the file when writing it for the first time. -If this command is not given, the daemon will always start with an initial -frequency of zero. - -

    The file format consists of a single line containing a single -floating point number, which records the frequency offset measured -in parts-per-million (PPM). -The file is updated by first writing -the current drift value into a temporary file and then renaming -this file to replace the old version. -This implies that -ntpd(1ntpdmdoc) -must have write permission for the directory the -drift file is located in, and that file system links, symbolic or -otherwise, should be avoided. -

    Xo
    .Oo -auth | Cm bclient | calibrate | Cm kernel | monitor | Cm ntp | pps | Cm stats .Oc -
    Xo
    .Oo -auth | Cm bclient | calibrate | Cm kernel | monitor | Cm ntp | pps | Cm stats .Oc -Provides a way to enable or disable various server options. -Flags not mentioned are unaffected. -Note that all of these flags -can be controlled remotely using the -ntpdc(1ntpdcmdoc) -utility program. -
    -
    Cm
    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.
    Cm
    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.
    Cm
    Enables the calibrate feature for reference clocks. -The default for -this flag is -disable.
    Cm
    Enables the kernel time discipline, if available. -The default for this -flag is -enable if support is available, otherwise -disable.
    Cm
    Enables the monitoring facility. -See the -ntpdc(1ntpdcmdoc) -program -and the -monlist command or further information. -The -default for this flag is -enable.
    Cm
    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.
    Cm
    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 -/usr/share/doc/ntp) -page for further information. -The default for this flag is -disable.
    Cm
    Enables the statistics facility. -See the -MonitoringMonitoring -Options -section for further information. -The default for this flag is -disable.
    - .It -Ic -includefile -Ar -includefile -This command allows additional configuration commands -to be included from a separate file. -Include files may -be nested to a depth of five; upon reaching the end of any -include file, command processing resumes in the previous -configuration file. -This option is useful for sites that run -ntpd(1ntpdmdoc) -on multiple hosts, with (mostly) common options (e.g., a -restriction list). -.It -Ic -logconfig -Ar -configkeyword -This command controls the amount and type of output written to -the system -syslog(3) -facility or the alternate -logfile log file. -By default, all output is turned on. -All -configkeyword keywords can be prefixed with -=, -+ -and --, -where -= -sets the -syslog(3) -priority mask, -+ -adds and -- -removes -messages. -syslog(3) -messages can be controlled in four -classes -.Po -clock, peer, sys and -sync .Pc -. -Within these classes four types of messages can be -controlled: informational messages -.Po -info .Pc -, -event messages -.Po -events .Pc -, -statistics messages -.Po -statistics .Pc -and -status messages -.Po -status .Pc -. - -

    Configuration keywords are formed by concatenating the message class with -the event class. -The -all prefix can be used instead of a message class. -A -message class may also be followed by the -all keyword to enable/disable all -messages of the respective message class.Thus, a minimal log configuration -could look like this: -.Bd --literal -logconfig =syncstatus +sysevents -.Ed - -

    This would just list the synchronizations state of -ntpd(1ntpdmdoc) -and the major system events. -For a simple reference server, the -following minimum message configuration could be useful: -.Bd --literal -logconfig =syncall +clockall -.Ed - -

    This configuration will list all clock information and -synchronization information. -All other events and messages about -peers, system events and so on is suppressed. -.It -Ic -logfile -Ar -logfile -This command specifies the location of an alternate log file to -be used instead of the default system -syslog(3) -facility. -This is the same operation as the -l command line option. -.It -Ic -setvar -Ar -variable -Op -Cm -default -This command adds an additional system variable. -These -variables can be used to distribute additional information such as -the access policy. -If the variable of the form -.Sm -off -.Va -name -= -Ar -value -.Sm -on -is followed by the -default keyword, the -variable will be listed as part of the default system variables -.Po -ntpq(1ntpqmdoc) -rv command -.Pc -) -. -These additional variables serve -informational purposes only. -They are not related to the protocol -other that they can be listed. -The known protocol variables will -always override any variables defined via the -setvar mechanism. -There are three special variables that contain the names -of all variable of the same group. -The -.Va -sys_var_list -holds -the names of all system variables. -The -.Va -peer_var_list -holds -the names of all peer variables and the -.Va -clock_var_list -holds the names of the reference clock variables. -.It -Xo -Ic -tinker -.Oo -allan allan | dispersion dispersion | freq freq | huffpuff huffpuff | panic panic | step srep | stepout stepout .Oc -This command can be used to alter several system variables in -very exceptional circumstances. -It should occur in the -configuration file before any other configuration options. -The -default values of these variables have been carefully optimized for -a wide range of network speeds and reliability expectations. -In -general, they interact in intricate ways that are hard to predict -and some combinations can result in some very nasty behavior. -Very -rarely is it necessary to change the default values; but, some -folks cannot resist twisting the knobs anyway and this command is -for them. -Emphasis added: twisters are on their own and can expect -no help from the support group. - -

    The variables operate as follows: -

    -
    Cm
    The argument becomes the new value for the minimum Allan -intercept, which is a parameter of the PLL/FLL clock discipline -algorithm. -The value in log2 seconds defaults to 7 (1024 s), which is also the lower -limit. -
    Cm
    The argument becomes the new value for the dispersion increase rate, -normally .000015 s/s. -
    Cm
    The argument becomes the initial value of the frequency offset in -parts-per-million. -This overrides the value in the frequency file, if -present, and avoids the initial training state if it is not. -
    Cm
    The argument becomes the new value for the experimental -huff-n'-puff filter span, which determines the most recent interval -the algorithm will search for a minimum delay. -The lower limit is -900 s (15 m), but a more reasonable value is 7200 (2 hours). -There -is no default, since the filter is not enabled unless this command -is given. -
    Cm
    The argument is the panic threshold, normally 1000 s. -If set to zero, -the panic sanity check is disabled and a clock offset of any value will -be accepted. -
    Cm
    The argument is the step threshold, which by default is 0.128 s. -It can -be set to any positive number in seconds. -If set to zero, step -adjustments will never occur. -Note: The kernel time discipline is -disabled if the step threshold is set to zero or greater than the -default. -
    Cm
    The argument is the stepout timeout, which by default is 900 s. -It can -be set to any positive number in seconds. -If set to zero, the stepout -pulses will not be suppressed. -
    - .It -Xo -Ic -trap -Ar -host_address -[port port_number ] -[interface interface_address ] -This command configures a trap receiver at the given host -address and port number for sending messages with the specified -local interface address. -If the port number is unspecified, a value -of 18447 is used. -If the interface address is not specified, the -message is sent with a source address of the local interface the -message is sent through. -Note that on a multihomed host the -interface used may vary from time to time with routing changes. - -

    The trap receiver will generally log event messages and other -information from the server in a log file. -While such monitor -programs may also request their own trap dynamically, configuring a -trap receiver will ensure that no messages are lost when the server -is started. -.It -Cm -hop -Ar -... -This command specifies a list of TTL values in increasing order, up to 8 -values can be specified. -In manycast mode these values are used in turn in -an expanding-ring search. -The default is eight multiples of 32 starting at -31. - -

    This section was generated by AutoGen, -using the agtexi-cmd template and the option descriptions for the ntp.conf program. -This software is released under the NTP license, <http://ntp.org/license>. - - - diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index f30a7cd98..9ad6f5f7c 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -1,8 +1,8 @@ -.TH ntp.conf 5 "03 Jan 2013" "4.2.7p344" "File Formats" +.TH ntp.conf 5 "04 Jan 2013" "4.2.7p345" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 3, 2013 at 01:09:10 PM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 4, 2013 at 09:02:47 AM by AutoGen 5.17.1pre11 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" @@ -1165,7 +1165,7 @@ the file generation set named The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next five fields -show time offset (seconds), frequency offset (parts per million - +show time offset (seconds), frequency offset (parts per million \- PPM), RMS jitter (seconds), Allan deviation (PPM) and clock discipline time constant. .ti -4 @@ -1181,7 +1181,7 @@ generation set named .br .in +4 .nf -48773 10847.650 127.127.4.1 9714 -0.001605376 0.000000000 0.001424877 0.000958674 +48773 10847.650 127.127.4.1 9714 \-0.001605376 0.000000000 0.001424877 0.000958674 .in -4 .fi .PP @@ -2618,7 +2618,7 @@ keywords can be prefixed with .Ql = , .Ql + and -.Ql - , +.Ql \- , where .Ql = sets the @@ -2626,7 +2626,7 @@ sets the priority mask, .Ql + adds and -.Ql - +.Ql \- removes messages. .Xr syslog 3 @@ -2698,7 +2698,7 @@ This command specifies the location of an alternate log file to be used instead of the default system .Xr syslog 3 facility. -This is the same operation as the -l command line option. +This is the same operation as the \-l command line option. .TP .BR Ic setvar Ar variable Op Cm default This command adds an additional system variable. @@ -2850,6 +2850,46 @@ In manycast mode these values are used in turn in an expanding-ring search. The default is eight multiples of 32 starting at 31. +.SH "OPTIONS" +.TP +.BR \-\-help +Display usage information and exit. +.TP +.BR \-\-more-help +Pass the extended usage information through a pager. +.TP +.BR \-\-version "[=\fI{v|c|n}\fP]" +Output version of program and exit. The default mode is `v', a simple +version. The `c' mode will print copyright information and `n' will +print the full copyright notice. +.SH "OPTION PRESETS" +Any option that is not marked as \fInot presettable\fP may be preset +by loading values from environment variables named: +.nf + \fBNTP_CONF_\fP or \fBNTP_CONF\fP +.fi +.ad +cvt_prog='/usr/local/gnu/share/autogen/texi2man' +cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd + `/`basename "$cvt_prog"` +cd $tmp_dir +test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" +{ + list='synopsis description options option-presets' + for f in $list ; do cat $f ; echo ; done + rm \-f $list name + list='implementation-notes environment files examples exit-status errors + compatibility see-also conforming-to history authors copyright bugs + notes' + for f in $list ; do cat $f ; echo ; done > .end-doc + rm \-f $list + list=`ls \-1 *`' .end-doc' + for f in $list ; do cat $f ; echo ; done + rm \-f $list +} 1>.doc 2>/dev/null +sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +.SH "ENVIRONMENT" +See \fBOPTION PRESETS\fP for configuration environment variables. .SH FILES .TP .BR Pa /etc/ntp.conf @@ -2866,6 +2906,18 @@ RSA public key .TP .BR Pa ntp_dh Diffie-Hellman agreement parameters +.SH "EXIT STATUS" +One of the following exit values will be returned: +.TP +.BR 0 " (EXIT_SUCCESS)" +Successful program execution. +.TP +.BR 1 " (EXIT_FAILURE)" +The operation failed or the command syntax was not valid. +.TP +.BR 70 " (EX_SOFTWARE)" +libopts had an internal operational error. Please report +it to autogen-users@lists.sourceforge.net. Thank you. .SH "SEE ALSO" .SH SEE ALSO .Xr ntpd @NTPD_MS@ , @@ -2900,8 +2952,7 @@ 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 .SH NOTES -This document corresponds to version @VERSION@ of NTP. -This document was derived from FreeBSD. -.PP +This document corresponds to version 4.2.7p345 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 322ea0446..20c483dbc 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 3 2013 +.Dd January 4 2013 .Dt NTP_CONF 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 3, 2013 at 01:09:31 PM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 4, 2013 at 09:03:06 AM by AutoGen 5.17.1pre11 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -11,8 +11,8 @@ .Nd Network Time Protocol (NTP) daemon configuration file format .Sh SYNOPSIS .Nm -.Op Fl \-option-name -.Op Fl \-option-name Ar value +.Op Fl \-option\-name +.Op Fl \-option\-name Ar value .Pp All arguments must be options. .Pp @@ -43,7 +43,7 @@ followed by a list of arguments, some of which may be optional, separated by whitespace. Commands may not be continued over multiple lines. Arguments may be host names, -host addresses written in numeric, dotted-quad form, +host addresses written in numeric, dotted\-quad form, integers, floating point numbers (when specifying times in seconds) and text strings. .Pp @@ -108,7 +108,7 @@ Use of options not listed may not be caught as an error, but may result in some weird and even destructive behavior. .Pp -If the Basic Socket Interface Extensions for IPv6 (RFC-2553) +If the Basic Socket Interface Extensions for IPv6 (RFC\-2553) is detected, support for the IPv6 address family is generated in addition to the default support of the IPv4 address family. In a few cases, including the reslist billboard generated @@ -177,7 +177,7 @@ be used and the mode in which to operate. The .Ar address can be -either a DNS name or an IP address in dotted-quad notation. +either a DNS name or an IP address in dotted\-quad notation. Additional information on association behavior can be found in the .Qq Association Management page @@ -204,7 +204,7 @@ be used for type b or m addresses. .It Ic peer For type s addresses (only), this command mobilizes a -persistent symmetric-active mode association with the specified +persistent symmetric\-active mode association with the specified remote peer. In this mode the local clock can be synchronized to the remote peer or the remote peer can be synchronized to the local @@ -345,7 +345,7 @@ for further information. .It Cm ttl Ar ttl This option is used only with broadcast server and manycast client modes. -It specifies the time-to-live +It specifies the time\-to\-live .Ar ttl to use on broadcast server and multicast server and the maximum @@ -358,7 +358,7 @@ network administrator. .It Cm version Ar version Specifies the version number to be used for outgoing NTP packets. -Versions 1-4 are the choices, with version 4 the +Versions 1\-4 are the choices, with version 4 the default. .El .Ss Auxiliary Commands @@ -373,7 +373,7 @@ server, then enters the broadcast client mode, in which it synchronizes to succeeding broadcast messages. Note that, in order to avoid accidental or malicious disruption in this mode, both the -server and client should operate using symmetric-key or public-key +server and client should operate using symmetric\-key or public\-key authentication as described in .Sx Authentication Options . .It Ic manycastserver Ar address ... @@ -386,7 +386,7 @@ taken to limit the span of the reply and avoid a possibly massive implosion at the original sender. Note that, in order to avoid accidental or malicious disruption in this mode, both the server -and client should operate using symmetric-key or public-key +and client should operate using symmetric\-key or public\-key authentication as described in .Sx Authentication Options . .It Ic multicastclient Ar address ... @@ -399,8 +399,8 @@ exchange with the server, then enters the broadcast client mode, in which it synchronizes to succeeding multicast messages. Note that, in order to avoid accidental or malicious disruption in this mode, -both the server and client should operate using symmetric-key or -public-key authentication as described in +both the server and client should operate using symmetric\-key or +public\-key authentication as described in .Sx Authentication Options . .El .Sh Authentication Support @@ -408,15 +408,15 @@ Authentication support allows the NTP client to verify that the server is in fact known and trusted and not an intruder intending accidentally or on purpose to masquerade as that server. The NTPv3 -specification RFC-1305 defines a scheme which provides +specification RFC\-1305 defines a scheme which provides cryptographic authentication of received NTP packets. Originally, this was done using the Data Encryption Standard (DES) algorithm operating in Cipher Block Chaining (CBC) mode, commonly called -DES-CBC. +DES\-CBC. Subsequently, this was replaced by the RSA Message Digest -5 (MD5) algorithm using a private key, commonly called keyed-MD5. -Either algorithm computes a message digest, or one-way hash, which +5 (MD5) algorithm using a private key, commonly called keyed\-MD5. +Either algorithm computes a message digest, or one\-way hash, which can be used to verify the server has the correct private key and key identifier. .Pp @@ -537,9 +537,9 @@ cryptography are summarized below; further details are in the briefings, papers and reports at the NTP project page linked from .Li http://www.ntp.org/ . -.Ss Symmetric-Key Cryptography -The original RFC-1305 specification allows any one of possibly -65,534 keys, each distinguished by a 32-bit key identifier, to +.Ss Symmetric\-Key Cryptography +The original RFC\-1305 specification allows any one of possibly +65,534 keys, each distinguished by a 32\-bit key identifier, to authenticate an association. The servers and clients involved must agree on the key and key identifier to @@ -587,7 +587,7 @@ command selects the key used as the password for the utility. .Ss Public Key Cryptography NTPv4 supports the original NTPv3 symmetric key scheme -described in RFC-1305 and in addition the Autokey protocol, +described in RFC\-1305 and in addition the Autokey protocol, which is based on public key cryptography. The Autokey Version 2 protocol described on the Autokey Protocol page verifies packet integrity using MD5 message digests @@ -615,8 +615,8 @@ corresponding to the various NTP modes supported. Most modes use a special cookie which can be computed independently by the client and server, but encrypted in transmission. -All modes use in addition a variant of the S-KEY scheme, -in which a pseudo-random key list is generated and used +All modes use in addition a variant of the S\-KEY scheme, +in which a pseudo\-random key list is generated and used in reverse order. These schemes are described along with an executive summary, current status, briefing slides and reading list on the @@ -626,7 +626,7 @@ page. The specific cryptographic environment used by Autokey servers and clients is determined by a set of files and soft links generated by the -.Xr ntp-keygen 1ntpkeygenmdoc +.Xr ntp\-keygen 1ntpkeygenmdoc program. This includes a required host key file, required certificate file and optional sign key file, @@ -756,7 +756,7 @@ If it's the same key and the message is verified, Bob sends Cathy a reply authenticated with that key. If verification fails, -Bob sends Cathy a thing called a crypto-NAK, which tells her +Bob sends Cathy a thing called a crypto\-NAK, which tells her something broke. She can see the evidence using the .Xr ntpq @NTPQ_MS@ @@ -780,7 +780,7 @@ with one server and no authentication with another might not be wise. .Ss Key Management The cryptographic values used by the Autokey protocol are incorporated as a set of files generated by the -.Xr ntp-keygen 1ntpkeygenmdoc +.Xr ntp\-keygen 1ntpkeygenmdoc utility program, including symmetric key, host key and public certificate files, as well as sign key, identity parameters and leapseconds files. @@ -828,7 +828,7 @@ sent. Specifies the key identifier to use with the .Xr ntpq @NTPQ_MS@ utility, which uses the standard -protocol defined in RFC-1305. +protocol defined in RFC\-1305. The .Ar key argument is @@ -940,11 +940,11 @@ argument is a key identifier for the trusted key, where the value can be in the range 1 to 65,534, inclusive. .It Ic revoke Ar logsec -Specifies the interval between re-randomization of certain +Specifies the interval between re\-randomization of certain cryptographic values used by the Autokey scheme, as a power of 2 in seconds. These values need to be updated frequently in order to -deflect brute-force attacks on the algorithms of the scheme; +deflect brute\-force attacks on the algorithms of the scheme; however, updating some values is a relatively expensive operation. The default interval is 16 (65,536 s or about 18 hours). For poll @@ -964,7 +964,7 @@ purpose, although different keys can be used with different servers. The .Ar key -arguments are 32-bit unsigned +arguments are 32\-bit unsigned integers with values from 1 to 65,534. .El .Ss Error Codes @@ -1060,7 +1060,7 @@ the file generation set named The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next field shows the -clock address in dotted-quad notation. +clock address in dotted\-quad notation. The final field shows the last timecode received from the clock in decoded ASCII format, where meaningful. @@ -1082,7 +1082,7 @@ following form to the file generation set named The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next field shows the peer -address in dotted-quad notation, The final message field includes the +address in dotted\-quad notation, The final message field includes the message type and certain ancillary information. See the .Sx Authentication Options @@ -1100,7 +1100,7 @@ the file generation set named The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next five fields -show time offset (seconds), frequency offset (parts per million - +show time offset (seconds), frequency offset (parts per million \- PPM), RMS jitter (seconds), Allan deviation (PPM) and clock discipline time constant. .It Cm peerstats @@ -1113,20 +1113,20 @@ line of the following form to the current element of a file generation set named .Cm peerstats : .Bd -literal -48773 10847.650 127.127.4.1 9714 -0.001605376 0.000000000 0.001424877 0.000958674 +48773 10847.650 127.127.4.1 9714 \-0.001605376 0.000000000 0.001424877 0.000958674 .Ed .Pp The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next two fields -show the peer address in dotted-quad notation and status, +show the peer address in dotted\-quad notation and status, respectively. The status field is encoded in hex in the format described in Appendix A of the NTP specification RFC 1305. The final four fields show the offset, delay, dispersion and RMS jitter, all in seconds. .It Cm rawstats -Enables recording of raw-timestamp statistics information. +Enables recording of raw\-timestamp statistics information. This includes statistics records of all peers of a NTP server and of special signals, where present and configured. @@ -1142,7 +1142,7 @@ The first two fields show the date (Modified Julian Day) and time (seconds and fraction past UTC midnight). The next two fields show the remote peer or clock address followed by the local address -in dotted-quad notation. +in dotted\-quad notation. The final four fields show the originate, receive, transmit and final NTP timestamps in order. The timestamp @@ -1240,7 +1240,7 @@ modifications via the .Ar filegen option. It is defined by the -server, usually specified as a compile-time constant. +server, usually specified as a compile\-time constant. It may, however, be configurable for individual file generation sets via other commands. @@ -1306,7 +1306,7 @@ and a day specification in the form .Cm YYYYMMdd . .Cm YYYY -is a 4-digit year number (e.g., 1992). +is a 4\-digit year number (e.g., 1992). .Cm MM is a two digit month number. .Cm dd @@ -1318,21 +1318,21 @@ in a file named .It Cm week Any file set member contains data related to a certain week of a year. -The term week is defined by computing day-of-year +The term week is defined by computing day\-of\-year modulo 7. Elements of such a file generation set are distinguished by appending the following suffix to the file set -filename base: A dot, a 4-digit year number, the letter +filename base: A dot, a 4\-digit year number, the letter .Cm W , -and a 2-digit week number. +and a 2\-digit week number. For example, information from January, 10th 1992 would end up in a file with suffix .No . Ns Ar 1992W1 . .It Cm month One generation file set element is generated per month. The -file name suffix consists of a dot, a 4-digit year number, and -a 2-digit month. +file name suffix consists of a dot, a 4\-digit year number, and +a 2\-digit month. .It Cm year One generation file element is generated per year. The filename @@ -1343,9 +1343,9 @@ the file set every 24 hours of server operation. The filename suffix consists of a dot, the letter .Cm a , -and an 8-digit number. +and an 8\-digit number. This number is taken to be the number of seconds the server is -running at the start of the corresponding 24-hour period. +running at the start of the corresponding 24\-hour period. Information is only written to a file generation by specifying .Cm enable ; output is prevented by specifying @@ -1423,7 +1423,7 @@ an indefinate period. When a client or network is denied access for an indefinate period, the only way at present to remove the restrictions is by restarting the server. -.Ss The Kiss-of-Death Packet +.Ss The Kiss\-of\-Death Packet Ordinarily, packets denied service are simply dropped with no further action except incrementing statistics counters. Sometimes a @@ -1431,9 +1431,9 @@ more proactive response is needed, such as a server message that explicitly requests the client to stop sending and leave a message for the system operator. A special packet format has been created -for this purpose called the "kiss-of-death" (KoD) packet. +for this purpose called the "kiss\-of\-death" (KoD) packet. KoD packets have the leap bits set unsynchronized and stratum set -to zero and the reference identifier field set to a four-byte +to zero and the reference identifier field set to a four\-byte ASCII code. If the .Cm noserve @@ -1476,11 +1476,11 @@ spacing, while the .Cm minimum subcommand specifies the minimum packet spacing. Packets that violate these minima are discarded -and a kiss-o'-death packet returned if enabled. +and a kiss\-o'\-death packet returned if enabled. The default minimum average and minimum are 5 and 2, respectively. The monitor subcommand specifies the probability of discard -for packets that overflow the rate-control window. +for packets that overflow the rate\-control window. .It Xo Ic restrict address .Op Cm mask Ar mask .Op Ar flag ... @@ -1488,13 +1488,13 @@ for packets that overflow the rate-control window. The .Ar address argument expressed in -dotted-quad form is the address of a host or network. +dotted\-quad form is the address of a host or network. Alternatively, the .Ar address argument can be a valid host DNS name. The .Ar mask -argument expressed in dotted-quad form defaults to +argument expressed in dotted\-quad form defaults to .Cm 255.255.255.255 , meaning that the .Ar address @@ -1518,7 +1518,7 @@ in that more restrictive flags will often make less restrictive ones redundant. The flags can generally be classed into two categories, those which restrict time service and those which -restrict informational queries and attempts to do run-time +restrict informational queries and attempts to do run\-time reconfiguration of the server. One or more of the following flags may be specified: @@ -1530,7 +1530,7 @@ and .Xr ntpdc @NTPDC_MS@ queries. .It Cm kod -If this flag is set when an access violation occurs, a kiss-o'-death +If this flag is set when an access violation occurs, a kiss\-o'\-death (KoD) packet is sent. KoD packets are rate limited to no more than one per second. @@ -1599,7 +1599,7 @@ UDP port (123). Both .Cm ntpport and -.Cm non-ntpport +.Cm non\-ntpport may be specified. The @@ -1634,7 +1634,7 @@ of the nearby manycast servers, yet automatically reconfigures to sustain this number of servers should one or another fail. .Pp Note that the manycasting paradigm does not coincide -with the anycast paradigm described in RFC-1546, +with the anycast paradigm described in RFC\-1546, which is designed to find a single server from a clique of servers providing the same service. The manycast paradigm is designed to find a plurality @@ -1663,7 +1663,7 @@ The IANA has designated IPv4 address 224.1.1.1 and IPv6 address FF05::101 (site local) for NTP. When more servers are needed, it broadcasts manycast client messages to this address at the minimum feasible rate -and minimum feasible time-to-live (TTL) hops, depending +and minimum feasible time\-to\-live (TTL) hops, depending on how many servers have already been found. There can be as many manycast client associations as different group address, each one serving as a template @@ -1693,7 +1693,7 @@ Then, the client polls the server at its unicast address in burst mode in order to reliably set the host clock and validate the source. This normally results -in a volley of eight client/server at 2-s intervals +in a volley of eight client/server at 2\-s intervals during which both the synchronization and cryptographic protocols run concurrently. Following the volley, @@ -1706,7 +1706,7 @@ in ordinary client/server mode. .Pp The manycast client polling strategy is designed to reduce as much as possible the volume of manycast client messages -and the effects of implosion due to near-simultaneous +and the effects of implosion due to near\-simultaneous arrival of manycast server messages. The strategy is determined by the .Ic manycastclient , @@ -1872,7 +1872,7 @@ servers will find the servers at the same stratum level. If one of the primary servers loses its GPS receiver, it will continue to operate as a client and other clients will time out the corresponding association and -re-associate accordingly. +re\-associate accordingly. .Pp Some administrators prefer to avoid running .Xr ntpd @NTPD_MS@ @@ -1994,13 +1994,13 @@ a single falseticker. This command specifies a list of TTL values in increasing order, up to 8 values can be specified. In manycast mode these values are used in turn -in an expanding-ring search. +in an expanding\-ring search. The default is eight multiples of 32 starting at 31. .El .Sh Reference Clock Support The NTP Version 4 daemon supports some three dozen different radio, -satellite and modem reference clocks plus a special pseudo-clock +satellite and modem reference clocks plus a special pseudo\-clock used for backup or when no other clock source is available. Detailed descriptions of individual device drivers and options can be found in the @@ -2020,7 +2020,7 @@ provided in .Pa /usr/share/doc/ntp ) . In addition, support for a PPS signal is available as described in the -.Qq Pulse-per-second (PPS) Signal Interfacing +.Qq Pulse\-per\-second (PPS) Signal Interfacing page (available as part of the HTML documentation provided in @@ -2070,7 +2070,7 @@ is an integer denoting the clock type and .Ar u indicates the unit -number in the range 0-3. +number in the range 0\-3. While it may seem overkill, it is in fact sometimes useful to configure multiple reference clocks of the same type, in which case the unit numbers must be unique. @@ -2130,7 +2130,7 @@ and options can be used to override the defaults for the device. There are two optional -device-dependent time offsets and four flags that can be included +device\-dependent time offsets and four flags that can be included in the .Ic fudge command as well. @@ -2147,7 +2147,7 @@ The .Cm stratum option is used for this purpose. Also, in cases -involving both a reference clock and a pulse-per-second (PPS) +involving both a reference clock and a pulse\-per\-second (PPS) discipline signal, it is useful to specify the reference clock identifier as other than the default, depending on the driver. The @@ -2184,7 +2184,7 @@ provided in for further information. .It Cm mode Ar int Specifies a mode number which is interpreted in a -device-specific fashion. +device\-specific fashion. For instance, it selects a dialing protocol in the ACTS driver and a device subtype in the parse @@ -2234,7 +2234,7 @@ follows: .Bl -tag -width indent .It Cm time1 Ar sec Specifies a constant to be added to the time offset produced by -the driver, a fixed-point decimal number in seconds. +the driver, a fixed\-point decimal number in seconds. This is used as a calibration constant to adjust the nominal time offset of a particular clock to agree with an external standard, such as a @@ -2262,8 +2262,8 @@ page provided in .Pa /usr/share/doc/ntp ) . .It Cm time2 Ar secs -Specifies a fixed-point decimal number in seconds, which is -interpreted in a driver-dependent way. +Specifies a fixed\-point decimal number in seconds, which is +interpreted in a driver\-dependent way. See the descriptions of specific drivers in the .Qq Reference Clock Drivers @@ -2284,7 +2284,7 @@ overrides the default identifier ordinarily assigned by the driver itself. .It Cm mode Ar int Specifies a mode number which is interpreted in a -device-specific fashion. +device\-specific fashion. For instance, it selects a dialing protocol in the ACTS driver and a device subtype in the parse @@ -2351,7 +2351,7 @@ frequency of zero. .Pp The file format consists of a single line containing a single floating point number, which records the frequency offset measured -in parts-per-million (PPM). +in parts\-per\-million (PPM). The file is updated by first writing the current drift value into a temporary file and then renaming this file to replace the old version. @@ -2428,7 +2428,7 @@ The default for this flag is .Ic enable . .It Cm pps -Enables the pulse-per-second (PPS) signal when frequency and time is +Enables the pulse\-per\-second (PPS) signal when frequency and time is disciplined by the precision time kernel modifications. See the .Qq A Kernel Model for Precision Timekeeping @@ -2471,7 +2471,7 @@ keywords can be prefixed with .Ql = , .Ql + and -.Ql - , +.Ql \- , where .Ql = sets the @@ -2479,7 +2479,7 @@ sets the priority mask, .Ql + adds and -.Ql - +.Ql \- removes messages. .Xr syslog 3 @@ -2544,7 +2544,7 @@ This command specifies the location of an alternate log file to be used instead of the default system .Xr syslog 3 facility. -This is the same operation as the -l command line option. +This is the same operation as the \-l command line option. .It Ic setvar Ar variable Op Cm default This command adds an additional system variable. These @@ -2624,12 +2624,12 @@ The argument becomes the new value for the dispersion increase rate, normally .000015 s/s. .It Cm freq Ar freq The argument becomes the initial value of the frequency offset in -parts-per-million. +parts\-per\-million. This overrides the value in the frequency file, if present, and avoids the initial training state if it is not. .It Cm huffpuff Ar huffpuff The argument becomes the new value for the experimental -huff-n'-puff filter span, which determines the most recent interval +huff\-n'\-puff filter span, which determines the most recent interval the algorithm will search for a minimum delay. The lower limit is 900 s (15 m), but a more reasonable value is 7200 (2 hours). @@ -2682,10 +2682,49 @@ is started. This command specifies a list of TTL values in increasing order, up to 8 values can be specified. In manycast mode these values are used in turn in -an expanding-ring search. +an expanding\-ring search. The default is eight multiples of 32 starting at 31. .El +.Sh "OPTIONS" +.Bl -tag +.It \-\-help +Display usage information and exit. +.It \-\-more\-help +Pass the extended usage information through a pager. +.It \-\-version "[=\fI{v|c|n}\fP]" +Output version of program and exit. The default mode is `v', a simple +version. The `c' mode will print copyright information and `n' will +print the full copyright notice. +.El +.Sh "OPTION PRESETS" +Any option that is not marked as \fInot presettable\fP may be preset +by loading values from environment variables named: +.nf + \fBNTP_CONF_\fP or \fBNTP_CONF\fP +.fi +.ad +cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' +cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd + `/`basename "$cvt_prog"` +cd $tmp_dir +test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" +{ + list='synopsis description options option\-presets' + for f in $list ; do cat $f ; echo ; done + rm \-f $list name + list='implementation\-notes environment files examples exit\-status errors + compatibility see\-also conforming\-to history authors copyright bugs + notes' + for f in $list ; do cat $f ; echo ; done > .end\-doc + rm \-f $list + list=`ls \-1 *`' .end\-doc' + for f in $list ; do cat $f ; echo ; done + rm \-f $list +} 1>.doc 2>/dev/null +sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +.Sh "ENVIRONMENT" +See \fBOPTION PRESETS\fP for configuration environment variables. .Sh FILES .Bl -tag -width /etc/ntp.drift -compact .It Pa /etc/ntp.conf @@ -2697,7 +2736,18 @@ RSA private key .It Pa ntpkey_ Ns Ar host RSA public key .It Pa ntp_dh -Diffie-Hellman agreement parameters +Diffie\-Hellman agreement parameters +.El +.Sh "EXIT STATUS" +One of the following exit values will be returned: +.Bl -tag +.It 0 " (EXIT_SUCCESS)" +Successful program execution. +.It 1 " (EXIT_FAILURE)" +The operation failed or the command syntax was not valid. +.It 70 " (EX_SOFTWARE)" +libopts had an internal operational error. Please report +it to autogen\-users@lists.sourceforge.net. Thank you. .El .Sh "SEE ALSO" .Sh SEE ALSO @@ -2719,7 +2769,7 @@ A snapshot of this documentation is available in HTML format in .Sh "AUTHORS" The University of Delaware .Sh "COPYRIGHT" -Copyright (C) 1970-2013 The University of Delaware all rights reserved. +Copyright (C) 1970\-2013 The University of Delaware all rights reserved. This program is released under the terms of the NTP license, . .Sh BUGS The syntax checking is not picky; some combinations of @@ -2733,8 +2783,7 @@ 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 .Sh NOTES -This document corresponds to version @VERSION@ of NTP. -This document was derived from FreeBSD. -.Pp -This manual page was \fIAutoGen\fP-erated from the \fBntp.conf\fP +This document corresponds to version 4.2.7p345 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 adcd18a74..4feb3eede 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,13 +1,13 @@ -.TH ntp.keys 5man "03 Jan 2013" "4.2.7p344" "File Formats" +.TH ntp.keys 5man "04 Jan 2013" "4.2.7p345" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 3, 2013 at 01:09:15 PM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 4, 2013 at 09:02:52 AM by AutoGen 5.17.1pre11 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .\" .SH NAME -ntp.keys \- NTP symmetric key file format +ntp.keys \- NTP symmetric key file format configuration file .SH SYNOPSIS .B /etc/ntp.keys .PP @@ -96,6 +96,25 @@ and programs are checked against passwords requested by the programs and entered by hand, so it is generally appropriate to specify these keys in ASCII format. +cvt_prog='/usr/local/gnu/share/autogen/texi2man' +cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd + `/`basename "$cvt_prog"` +cd $tmp_dir +test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" +{ + list='synopsis description options option-presets' + for f in $list ; do cat $f ; echo ; done + rm \-f $list name + list='implementation-notes environment files examples exit-status errors + compatibility see-also conforming-to history authors copyright bugs + notes' + for f in $list ; do cat $f ; echo ; done > .end-doc + rm \-f $list + list=`ls \-1 *`' .end-doc' + for f in $list ; do cat $f ; echo ; done + rm \-f $list +} 1>.doc 2>/dev/null +sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH FILES .TP .BR Pa /etc/ntp.keys @@ -114,8 +133,7 @@ This program is released under the terms of the NTP license, \fP or \fBNTP_KEYS\fP +.fi +.ad +cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' +cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd + `/`basename "$cvt_prog"` +cd $tmp_dir +test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" +{ + list='synopsis description options option\-presets' + for f in $list ; do cat $f ; echo ; done + rm \-f $list name + list='implementation\-notes environment files examples exit\-status errors + compatibility see\-also conforming\-to history authors copyright bugs + notes' + for f in $list ; do cat $f ; echo ; done > .end\-doc + rm \-f $list + list=`ls \-1 *`' .end\-doc' + for f in $list ; do cat $f ; echo ; done + rm \-f $list +} 1>.doc 2>/dev/null +sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +.Sh "ENVIRONMENT" +See \fBOPTION PRESETS\fP for configuration environment variables. .Sh FILES .Bl -tag -width /etc/ntp.keys -compact .It Pa /etc/ntp.keys the default name of the configuration file .El +.Sh "EXIT STATUS" +One of the following exit values will be returned: +.Bl -tag +.It 0 " (EXIT_SUCCESS)" +Successful program execution. +.It 1 " (EXIT_FAILURE)" +The operation failed or the command syntax was not valid. +.It 70 " (EX_SOFTWARE)" +libopts had an internal operational error. Please report +it to autogen\-users@lists.sourceforge.net. Thank you. +.El .Sh "SEE ALSO" .Xr ntp.conf 5 , .Xr ntpd 1ntpdmdoc , @@ -108,13 +158,12 @@ the default name of the configuration file .Sh "AUTHORS" The University of Delaware .Sh "COPYRIGHT" -Copyright (C) 1970-2013 The University of Delaware all rights reserved. +Copyright (C) 1970\-2013 The University of Delaware all rights reserved. This program is released under the terms of the NTP license, . .Sh "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version @VERSION@ of NTP. -This document was derived from FreeBSD. -.Pp -This manual page was \fIAutoGen\fP-erated from the \fBntp.keys\fP +This document corresponds to version 4.2.7p345 of NTP. +This document was derived from FreeBSD..Pp +This manual page was \fIAutoGen\fP\-erated from the \fBntp.keys\fP option definitions. diff --git a/ntpd/ntp.keys.html b/ntpd/ntp.keys.html index 0e66d49ec..a244fa5cf 100644 --- a/ntpd/ntp.keys.html +++ b/ntpd/ntp.keys.html @@ -33,7 +33,7 @@ Up: (dir)

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

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

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

    Short Contents

    @@ -79,8 +79,10 @@ page.

    ntpd(8) reads its keys from a file specified using the --k command line option or the -keys statement in the configuration file. +-k +command line option or the +keys +statement in the configuration file. While key number 0 is fixed by the NTP standard (as 56 zero bits) and may not be changed, @@ -91,53 +93,50 @@ may be arbitrarily set in the keys file. as the configuration file. Key entries use a fixed format of the form -

    .D1 -Ar -keyno -type -key - +

         keyno type key
+

    where -keyno is a positive integer (between 1 and 65534), -type is the message digest algorithm, +keyno +is a positive integer (between 1 and 65534), +type +is the message digest algorithm, and -key is the key itself. +key +is the key itself.

    The -key may be given in a format +key +may be given in a format controlled by the -type field. +type +field. The -type .Li -MD5 +type +MD5 is always supported. If -.Li -ntpd +ntpd was built with the OpenSSL library then any digest library supported by that library may be specified. However, if compliance with FIPS 140-2 is required the -type must be either -.Li -SHA +type +must be either +SHA or -.Li -SHA1 -. +SHA1.

    What follows are some key types, and corresponding formats:

    -
    Li
    The key is 1 to 16 printable characters terminated by +
    MD5
    The key is 1 to 16 printable characters terminated by an EOL, whitespace, or a -.Li # (which is the "start of comment" character). -
    Li
    Li
    Li
    The key is a hex-encoded ASCII string of 40 characters, +
    SHA
    SHA1
    RMD160
    The key is a hex-encoded ASCII string of 40 characters, which is truncated as necessary.
    @@ -153,5 +152,50 @@ so it is generally appropriate to specify these keys in ASCII format. using the agtexi-cmd template and the option descriptions for the ntp.keys program. This software is released under the NTP license, <http://ntp.org/license>. + + +
    +

    +Next: , +Up: ntp.keys Notes +
    +
    + +

    ntp.keys Files

    + +
    +
    /etc/ntp.keys
    the default name of the configuration file +
    +
    +

    +Next: , +Previous: ntp.keys Files, +Up: ntp.keys Notes +
    +
    + +

    ntp.keys See Also

    + +

    ntp.conf(5), +ntpd(1ntpdmdoc), +ntpdate(1ntpdatemdoc), +ntpdc(1ntpdcmdoc), +sntp(1sntpmdoc) +

    +

    +Previous: ntp.keys See Also, +Up: ntp.keys Notes +
    +
    + +

    ntp.keys Notes

    + +

    This document corresponds to version of NTP. +This document was derived from FreeBSD. + diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 9fb79c568..fb24bac78 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,13 +1,13 @@ -.TH ntp.keys 5 "03 Jan 2013" "4.2.7p344" "File Formats" +.TH ntp.keys 5 "04 Jan 2013" "4.2.7p345" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 3, 2013 at 01:09:15 PM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 4, 2013 at 09:02:52 AM by AutoGen 5.17.1pre11 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .\" .SH NAME -ntp.keys \- NTP symmetric key file format +ntp.keys \- NTP symmetric key file format configuration file .SH SYNOPSIS .B /etc/ntp.keys .PP @@ -96,6 +96,25 @@ and programs are checked against passwords requested by the programs and entered by hand, so it is generally appropriate to specify these keys in ASCII format. +cvt_prog='/usr/local/gnu/share/autogen/texi2man' +cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd + `/`basename "$cvt_prog"` +cd $tmp_dir +test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" +{ + list='synopsis description options option-presets' + for f in $list ; do cat $f ; echo ; done + rm \-f $list name + list='implementation-notes environment files examples exit-status errors + compatibility see-also conforming-to history authors copyright bugs + notes' + for f in $list ; do cat $f ; echo ; done > .end-doc + rm \-f $list + list=`ls \-1 *`' .end-doc' + for f in $list ; do cat $f ; echo ; done + rm \-f $list +} 1>.doc 2>/dev/null +sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH FILES .TP .BR Pa /etc/ntp.keys @@ -114,8 +133,7 @@ This program is released under the terms of the NTP license, \fP or \fBNTP_KEYS\fP +.fi +.ad +cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' +cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd + `/`basename "$cvt_prog"` +cd $tmp_dir +test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" +{ + list='synopsis description options option\-presets' + for f in $list ; do cat $f ; echo ; done + rm \-f $list name + list='implementation\-notes environment files examples exit\-status errors + compatibility see\-also conforming\-to history authors copyright bugs + notes' + for f in $list ; do cat $f ; echo ; done > .end\-doc + rm \-f $list + list=`ls \-1 *`' .end\-doc' + for f in $list ; do cat $f ; echo ; done + rm \-f $list +} 1>.doc 2>/dev/null +sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +.Sh "ENVIRONMENT" +See \fBOPTION PRESETS\fP for configuration environment variables. .Sh FILES .Bl -tag -width /etc/ntp.keys -compact .It Pa /etc/ntp.keys the default name of the configuration file .El +.Sh "EXIT STATUS" +One of the following exit values will be returned: +.Bl -tag +.It 0 " (EXIT_SUCCESS)" +Successful program execution. +.It 1 " (EXIT_FAILURE)" +The operation failed or the command syntax was not valid. +.It 70 " (EX_SOFTWARE)" +libopts had an internal operational error. Please report +it to autogen\-users@lists.sourceforge.net. Thank you. +.El .Sh "SEE ALSO" .Xr ntp.conf 5 , .Xr ntpd @NTPD_MS@ , @@ -108,13 +158,12 @@ the default name of the configuration file .Sh "AUTHORS" The University of Delaware .Sh "COPYRIGHT" -Copyright (C) 1970-2013 The University of Delaware all rights reserved. +Copyright (C) 1970\-2013 The University of Delaware all rights reserved. This program is released under the terms of the NTP license, . .Sh "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version @VERSION@ of NTP. -This document was derived from FreeBSD. -.Pp -This manual page was \fIAutoGen\fP-erated from the \fBntp.keys\fP +This document corresponds to version 4.2.7p345 of NTP. +This document was derived from FreeBSD..Pp +This manual page was \fIAutoGen\fP\-erated from the \fBntp.keys\fP option definitions. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index e544c96b5..467219851 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed January 3, 2013 at 01:07:05 PM by AutoGen 5.17.1pre11 + * It has been AutoGen-ed January 4, 2013 at 09:01:39 AM by AutoGen 5.17.1pre11 * From the definitions ntpd-opts.def * and the template file options * @@ -78,7 +78,7 @@ extern FILE * option_usage_fp; * ntpd option static const strings */ static char const ntpd_opt_strs[2987] = -/* 0 */ "ntpd 4.2.7p344\n" +/* 0 */ "ntpd 4.2.7p345\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" @@ -204,12 +204,12 @@ static char const ntpd_opt_strs[2987] = /* 2753 */ "Output version information and exit\0" /* 2789 */ "version\0" /* 2797 */ "NTPD\0" -/* 2802 */ "ntpd - NTP daemon program - Ver. 4.2.7p344\n" +/* 2802 */ "ntpd - NTP daemon program - Ver. 4.2.7p345\n" "USAGE: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 2935 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2969 */ "\n\n\0" -/* 2972 */ "ntpd 4.2.7p344"; +/* 2972 */ "ntpd 4.2.7p345"; /* * ipv4 option description with diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 50af21e13..f9dfb1b0b 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed January 3, 2013 at 01:07:03 PM by AutoGen 5.17.1pre11 + * It has been AutoGen-ed January 4, 2013 at 09:01:38 AM by AutoGen 5.17.1pre11 * From the definitions ntpd-opts.def * and the template file options * @@ -104,8 +104,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 37 -#define NTPD_VERSION "4.2.7p344" -#define NTPD_FULL_VERSION "ntpd 4.2.7p344" +#define NTPD_VERSION "4.2.7p345" +#define NTPD_FULL_VERSION "ntpd 4.2.7p345" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index c9b72d8a6..b7d23b6a0 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -1,8 +1,8 @@ -.TH ntpd 1ntpdman "03 Jan 2013" "4.2.7p344" "User Commands" +.TH ntpd 1ntpdman "04 Jan 2013" "4.2.7p345" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed January 3, 2013 at 01:09:18 PM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 4, 2013 at 09:02:55 AM by AutoGen 5.17.1pre11 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" @@ -84,7 +84,7 @@ will set the to 022. .SH "OPTIONS" .TP -.BR \-4 ", " -\-ipv4 +.BR \-4 ", " \-\-ipv4 Force IPv4 DNS name resolution. This option must not appear in combination with any of the following options: ipv6. @@ -92,7 +92,7 @@ ipv6. Force DNS resolution of following host names on the command line to the IPv4 namespace. .TP -.BR \-6 ", " -\-ipv6 +.BR \-6 ", " \-\-ipv6 Force IPv6 DNS name resolution. This option must not appear in combination with any of the following options: ipv4. @@ -100,7 +100,7 @@ ipv4. Force DNS resolution of following host names on the command line to the IPv6 namespace. .TP -.BR \-a ", " -\-authreq +.BR \-a ", " \-\-authreq Require crypto authentication. This option must not appear in combination with any of the following options: authnoreq. @@ -109,7 +109,7 @@ Require cryptographic authentication for broadcast client, multicast client and symmetric passive associations. This is the default. .TP -.BR \-A ", " -\-authnoreq +.BR \-A ", " \-\-authnoreq Do not require crypto authentication. This option must not appear in combination with any of the following options: authreq. @@ -118,7 +118,7 @@ Do not require cryptographic authentication for broadcast client, multicast client and symmetric passive associations. This is almost never a good idea. .TP -.BR \-b ", " -\-bcastsync +.BR \-b ", " \-\-bcastsync Allow us to sync to broadcast servers. .sp .TP @@ -129,7 +129,7 @@ The name and path of the configuration file, \fI/etc/ntp.conf\fP by default. .TP -.BR \-d ", " -\-debug\-level +.BR \-d ", " \-\-debug\-level Increase debug verbosity level. This option may appear an unlimited number of times. .sp @@ -152,7 +152,7 @@ configuration specification in the \fI/etc/ntp.conf\fP file. .TP -.BR \-g ", " -\-panicgate +.BR \-g ", " \-\-panicgate Allow the first adjustment to be Big. This option may appear an unlimited number of times. .sp @@ -193,7 +193,7 @@ Open the network address given, or all the addresses associated with the given interface name. This option may appear multiple times. This option also implies not opening other addresses, except wildcard and localhost. This option is deprecated. Please consider using the configuration file -\fBinterface\fP command, which is more versatile. +\fBinterface\fP command, which is more versatile. .TP .BR \-k " \fIstring\fP, " \-\-keyfile "=" \fIstring\fP path to symmetric keys. @@ -214,7 +214,7 @@ This is the same operation as the \fBlogfile\fP \fIlogfile\fP configuration file directive. .TP -.BR \-L ", " -\-novirtualips +.BR \-L ", " \-\-novirtualips Do not listen to virtual interfaces. .sp Do not listen to virtual interfaces, defined as those with @@ -222,20 +222,20 @@ names containing a colon. This option is deprecated. Please consider using the configuration file \fBinterface\fP command, which is more versatile. .TP -.BR \-M ", " -\-modifymmtimer +.BR \-M ", " \-\-modifymmtimer Modify Multimedia Timer (Windows only). .sp Set the Windows Multimedia Timer to highest resolution. This ensures the resolution does not change while ntpd is running, avoiding timekeeping glitches associated with changes. .TP -.BR \-n ", " -\-nofork +.BR \-n ", " \-\-nofork Do not fork. This option must not appear in combination with any of the following options: wait-sync. .sp .TP -.BR \-N ", " -\-nice +.BR \-N ", " \-\-nice Run at high priority. .sp To the extent permitted by the operating system, run @@ -262,7 +262,7 @@ at the specified \fBsched_setscheduler(SCHED_FIFO)\fP priority. .TP -.BR \-q ", " -\-quit +.BR \-q ", " \-\-quit Set the time and quit. This option must not appear in combination with any of the following options: saveconfigquit, wait-sync. @@ -351,7 +351,7 @@ otherwise it is \fBETIMEDOUT\fP. This provides the option for a script starting \fBntpd\fP to easily wait for the first set of the clock before proceeding. .TP -.BR \-x ", " -\-slew +.BR \-x ", " \-\-slew Slew up to 600 seconds. .sp 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. @@ -383,7 +383,7 @@ Force substitution the CPU counter for \fBQueryPerformanceCounter\fP. The CPU counter (RDTSC on x86) is used unconditionally with the given frequency (in Hz). .TP -.BR \-m ", " -\-mdns +.BR \-m ", " \-\-mdns Register with mDNS as a NTP server. .sp Registers as an NTP server with the local mDNS server which allows @@ -406,6 +406,25 @@ by loading values from environment variables named: \fBNTPD_\fP or \fBNTPD\fP .fi .ad +cvt_prog='/usr/local/gnu/share/autogen/texi2man' +cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd + `/`basename "$cvt_prog"` +cd $tmp_dir +test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" +{ + list='synopsis description options option-presets' + for f in $list ; do cat $f ; echo ; done + rm \-f $list name + list='implementation-notes environment files examples exit-status errors + compatibility see-also conforming-to history authors copyright bugs + notes' + for f in $list ; do cat $f ; echo ; done > .end-doc + rm \-f $list + list=`ls \-1 *`' .end-doc' + for f in $list ; do cat $f ; echo ; done + rm \-f $list +} 1>.doc 2>/dev/null +sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH USAGE .SS "How NTP Operates" The @@ -832,6 +851,10 @@ Successful program execution. .TP .BR 1 " (EXIT_FAILURE)" The operation failed or the command syntax was not valid. +.TP +.BR 70 " (EX_SOFTWARE)" +libopts had an internal operational error. Please report +it to autogen-users@lists.sourceforge.net. Thank you. .SH "SEE ALSO" .Xr ntp.conf 5 , .Xr ntpdate 8 , @@ -903,8 +926,7 @@ 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 .SH NOTES -This document corresponds to version @VERSION@ of NTP. -Portions of this document came from FreeBSD. -.PP +This document corresponds to version 4.2.7p345 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 649ec120f..555ac82ba 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd January 3 2013 +.Dd January 4 2013 .Dt NTPD 1ntpdmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed January 3, 2013 at 01:09:34 PM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 4, 2013 at 09:03:12 AM by AutoGen 5.17.1pre11 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -14,7 +14,7 @@ .\" Mixture of short (flag) options and long options .Op Fl flags .Op Fl flag Ar value -.Op Fl \-option-name Ar value +.Op Fl \-option\-name Ar value [ ... ] .Pp .Sh DESCRIPTION @@ -24,15 +24,15 @@ utility is an operating system daemon which sets and maintains the system time of day in synchronism with Internet standard time servers. It is a complete implementation of the -Network Time Protocol (NTP) version 4, as defined by RFC-5905, +Network Time Protocol (NTP) version 4, as defined by RFC\-5905, but also retains compatibility with -version 3, as defined by RFC-1305, and versions 1 -and 2, as defined by RFC-1059 and RFC-1119, respectively. +version 3, as defined by RFC\-1305, and versions 1 +and 2, as defined by RFC\-1059 and RFC\-1119, respectively. .Pp The .Nm -utility does most computations in 64-bit floating point -arithmetic and does relatively clumsy 64-bit fixed point operations +utility does most computations in 64\-bit floating point +arithmetic and does relatively clumsy 64\-bit fixed point operations only when necessary to preserve the ultimate precision, about 232 picoseconds. While the ultimate precision is not achievable with @@ -88,21 +88,21 @@ will set the to 022. .Sh "OPTIONS" .Bl -tag -.It \-4 ", " -\-ipv4 +.It \-4 ", " \-\-ipv4 Force IPv4 DNS name resolution. This option must not appear in combination with any of the following options: ipv6. .sp Force DNS resolution of following host names on the command line to the IPv4 namespace. -.It \-6 ", " -\-ipv6 +.It \-6 ", " \-\-ipv6 Force IPv6 DNS name resolution. This option must not appear in combination with any of the following options: ipv4. .sp Force DNS resolution of following host names on the command line to the IPv6 namespace. -.It \-a ", " -\-authreq +.It \-a ", " \-\-authreq Require crypto authentication. This option must not appear in combination with any of the following options: authnoreq. @@ -110,7 +110,7 @@ authnoreq. Require cryptographic authentication for broadcast client, multicast client and symmetric passive associations. This is the default. -.It \-A ", " -\-authnoreq +.It \-A ", " \-\-authnoreq Do not require crypto authentication. This option must not appear in combination with any of the following options: authreq. @@ -118,27 +118,24 @@ authreq. Do not require cryptographic authentication for broadcast client, multicast client and symmetric passive associations. This is almost never a good idea. -.It \-b ", " -\-bcastsync +.It \-b ", " \-\-bcastsync Allow us to sync to broadcast servers. .sp -.sp .It \-c " \fIstring\fP, " \-\-configfile "=" \fIstring\fP configuration file name. .sp The name and path of the configuration file, \fI/etc/ntp.conf\fP by default. -.It \-d ", " -\-debug\-level +.It \-d ", " \-\-debug\-level Increase debug verbosity level. This option may appear an unlimited number of times. .sp -.sp .It \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP Set the debug verbosity level. This option may appear an unlimited number of times. This option takes an integer number as its argument. .sp -.sp .It \-f " \fIstring\fP, " \-\-driftfile "=" \fIstring\fP frequency drift file name. .sp @@ -150,7 +147,7 @@ This is the same operation as the configuration specification in the \fI/etc/ntp.conf\fP file. -.It \-g ", " -\-panicgate +.It \-g ", " \-\-panicgate Allow the first adjustment to be Big. This option may appear an unlimited number of times. .sp @@ -189,7 +186,7 @@ Open the network address given, or all the addresses associated with the given interface name. This option may appear multiple times. This option also implies not opening other addresses, except wildcard and localhost. This option is deprecated. Please consider using the configuration file -\fBinterface\fP command, which is more versatile. +\fBinterface\fP command, which is more versatile. .It \-k " \fIstring\fP, " \-\-keyfile "=" \fIstring\fP path to symmetric keys. .sp @@ -207,26 +204,25 @@ The default is the system log file. This is the same operation as the \fBlogfile\fP \fIlogfile\fP configuration file directive. -.It \-L ", " -\-novirtualips +.It \-L ", " \-\-novirtualips Do not listen to virtual interfaces. .sp Do not listen to virtual interfaces, defined as those with names containing a colon. This option is deprecated. Please consider using the configuration file \fBinterface\fP command, which is more versatile. -.It \-M ", " -\-modifymmtimer +.It \-M ", " \-\-modifymmtimer Modify Multimedia Timer (Windows only). .sp Set the Windows Multimedia Timer to highest resolution. This ensures the resolution does not change while ntpd is running, avoiding timekeeping glitches associated with changes. -.It \-n ", " -\-nofork +.It \-n ", " \-\-nofork Do not fork. This option must not appear in combination with any of the following options: -wait-sync. -.sp +wait\-sync. .sp -.It \-N ", " -\-nice +.It \-N ", " \-\-nice Run at high priority. .sp To the extent permitted by the operating system, run @@ -250,10 +246,10 @@ To the extent permitted by the operating system, run at the specified \fBsched_setscheduler(SCHED_FIFO)\fP priority. -.It \-q ", " -\-quit +.It \-q ", " \-\-quit Set the time and quit. This option must not appear in combination with any of the following options: -saveconfigquit, wait-sync. +saveconfigquit, wait\-sync. .sp \fBntpd\fP will not daemonize and will exit after the clock is first @@ -273,7 +269,7 @@ Specify the default propagation delay from the broadcast/multicast server to thi .It \-\-saveconfigquit "=\fIstring\fP" Save parsed configuration and quit. This option must not appear in combination with any of the following options: -quit, wait-sync. +quit, wait\-sync. .sp Cause \fBntpd\fP to parse its startup configuration file and save an equivalent to the given filename and exit. This option was @@ -311,12 +307,10 @@ Use 0 to disable scanning. 60 seconds is the minimum time between scans. make ARG an ntp variable (RW). This option may appear an unlimited number of times. .sp -.sp .It \-\-dvar "=\fIndvar\fP" make ARG an ntp variable (RW|DEF). This option may appear an unlimited number of times. .sp -.sp .It \-w " \fInumber\fP, " \-\-wait\-sync "=" \fInumber\fP Seconds to wait for first clock sync. This option must not appear in combination with any of the following options: @@ -331,7 +325,7 @@ status is zero (success) if the clock was synchronized, otherwise it is \fBETIMEDOUT\fP. This provides the option for a script starting \fBntpd\fP to easily wait for the first set of the clock before proceeding. -.It \-x ", " -\-slew +.It \-x ", " \-\-slew Slew up to 600 seconds. .sp 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. @@ -360,14 +354,14 @@ Force CPU cycle counter use (Windows only). Force substitution the CPU counter for \fBQueryPerformanceCounter\fP. The CPU counter (RDTSC on x86) is used unconditionally with the given frequency (in Hz). -.It \-m ", " -\-mdns +.It \-m ", " \-\-mdns Register with mDNS as a NTP server. .sp Registers as an NTP server with the local mDNS server which allows the server to be discovered via mDNS client lookup. .It \-? , " \-\-help" Display usage information and exit. -.It \-! , " \-\-more-help" +.It \-! , " \-\-more\-help" Pass the extended usage information through a pager. .It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]" Output version of program and exit. The default mode is `v', a simple @@ -378,9 +372,28 @@ print the full copyright notice. Any option that is not marked as \fInot presettable\fP may be preset by loading values from environment variables named: .nf - \fBNTPD_\fP or \fBNTPD\fP + \fBNTPD_\fP or \fBNTPD\fP .fi .ad +cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' +cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd + `/`basename "$cvt_prog"` +cd $tmp_dir +test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" +{ + list='synopsis description options option\-presets' + for f in $list ; do cat $f ; echo ; done + rm \-f $list name + list='implementation\-notes environment files examples exit\-status errors + compatibility see\-also conforming\-to history authors copyright bugs + notes' + for f in $list ; do cat $f ; echo ; done > .end\-doc + rm \-f $list + list=`ls \-1 *`' .end\-doc' + for f in $list ; do cat $f ; echo ; done + rm \-f $list +} 1>.doc 2>/dev/null +sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh USAGE .Ss "How NTP Operates" The @@ -408,7 +421,7 @@ command, as described in .Xr ntp.conf 5 . .Pp Most operating systems and hardware of today incorporate a -time-of-year (TOY) chip to maintain the time during periods when +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. @@ -448,7 +461,7 @@ 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 +the synchronization distance, which is equal to one\-half the roundtrip delay plus error budget terms, can become very large. The .Nm @@ -484,7 +497,7 @@ the .Fl x option. The maximum slew rate possible is limited -to 500 parts-per-million (PPM) as a consequence of the correctness +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 @@ -497,7 +510,7 @@ correctly synchronized network time. .Pp 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 +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 @@ -543,7 +556,7 @@ If you can also keep a good .Pa ntp.drift file then .Xr ntpd 8 -will effectively "warm-start" and your system's clock will +will effectively "warm\-start" and your system's clock will be stable in under 11 seconds' time. .Pp As soon as possible in the startup sequence, start @@ -564,15 +577,15 @@ if you have processes like .Cm dovecot or database servers that require -monotonically-increasing time, +monotonically\-increasing time, run -.Xr ntp-wait 8 +.Xr ntp\-wait 8 as late as possible in the boot sequence (perhaps with the .Fl v flag) and after -.Xr ntp-wait 8 +.Xr ntp\-wait 8 exits successfully it is as safe as it will ever be to start any process that require stable time. @@ -621,12 +634,12 @@ provided in 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 +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 +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 @@ -702,7 +715,7 @@ the frequency and offset to settle down. Then the .Nm is -stopped and run in one-time mode as required. +stopped and run in one\-time mode as required. At each startup, the frequency is read from the file and initializes the kernel frequency. @@ -753,7 +766,7 @@ 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. -.Ss "The huff-n'-puff Filter" +.Ss "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. @@ -764,7 +777,7 @@ 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. .Pp -The huff-n'-puff filter is designed to correct the apparent time +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. @@ -805,6 +818,9 @@ One of the following exit values will be returned: Successful program execution. .It 1 " (EXIT_FAILURE)" The operation failed or the command syntax was not valid. +.It 70 " (EX_SOFTWARE)" +libopts had an internal operational error. Please report +it to autogen\-users@lists.sourceforge.net. Thank you. .El .Sh "SEE ALSO" .Xr ntp.conf 5 , @@ -863,22 +879,21 @@ A snapshot of this documentation is available in HTML format in .Sh "AUTHORS" The University of Delaware .Sh "COPYRIGHT" -Copyright (C) 1970-2013 The University of Delaware all rights reserved. +Copyright (C) 1970\-2013 The University of Delaware all rights reserved. This program is released under the terms of the NTP license, . .Sh BUGS The .Nm utility has gotten rather fat. While not huge, it has gotten -larger than might be desirable for an elevated-priority +larger than might be desirable for an elevated\-priority .Nm 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 .Sh NOTES -This document corresponds to version @VERSION@ of NTP. -Portions of this document came from FreeBSD. -.Pp -This manual page was \fIAutoGen\fP-erated from the \fBntpd\fP +This document corresponds to version 4.2.7p345 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 7e5f60369..13761536c 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.7p344 of ntpd. +

    This document applies to version 4.2.7p345 of ntpd.

    • ntpd Description: Description @@ -131,7 +131,8 @@ NetInfo if the default ntp.conf(5) file cannot be read and no file is specified by the --c option. +-c +option.

      Various internal ntpd @@ -218,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.7p343
+
      ntpd - NTP daemon program - Ver. 4.2.7p344
 USAGE:  ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
@@ -958,8 +959,7 @@ Up: ntpd Invocation
 
 
      How NTP Operates
      
 
-
      How NTP Operates
-The
+
      The
 ntpd
 utility operates by exchanging messages with
 one or more configured servers over a range of designated poll intervals. 
@@ -976,8 +976,10 @@ 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
-iburst keyword with the
-server configuration
+iburst
+keyword with the
+server
+configuration
 command, as described in
 ntp.conf(5).
 
@@ -1004,7 +1006,8 @@ This causes
 to exit with a panic message to
 the system log. 
 The
--g option overrides this check and the
+-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). 
@@ -1048,12 +1051,14 @@ in the future relative to the server.
 In some applications, this behavior may be unacceptable. 
 There are several solutions, however. 
 If the
--x option is included on the command line, the clock will
+-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
--x option. 
+-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
@@ -1082,11 +1087,13 @@ is to quickly correct the frequency and restore operation to the
 normal tracking mode. 
 In the most extreme cases
 (the host
-time.ien.it comes to mind), there may be occasional
+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
-burst keyword when
+burst
+keyword when
 configuring the server, but
 ONLY
 when you have permission to do so from the owner of the target host.
@@ -1109,10 +1116,11 @@ that often addresses all of the problems mentioned above.
 
 
      Starting NTP (Best Current Practice)
      
 
-
      Starting NTP (Best Current Practice)
-First, use the
-iburst option on your
-server entries.
+
      First, use the
+iburst
+option on your
+server
+entries.
 
   
      If you can also keep a good
 ntp.drift
@@ -1124,8 +1132,10 @@ be stable in under 11 seconds' time.
   
      As soon as possible in the startup sequence, start
 ntpd(8)
 with at least the
--g and perhaps the
--N options. 
+-g
+and perhaps the
+-N
+options. 
 Then,
 start the rest of your "normal" processes. 
 This will give
@@ -1134,14 +1144,16 @@ as much time as possible to get the system's clock synchronized and stable.
 
   
      Finally,
 if you have processes like
-dovecot or database servers
+dovecot
+or database servers
 that require
 monotonically-increasing time,
 run
 ntp-wait(8)
 as late as possible in the boot sequence
 (perhaps with the
--v flag)
+-v
+flag)
 and after
 ntp-wait(8)
 exits successfully
@@ -1155,8 +1167,7 @@ stable time.
 
 
      Frequency Discipline
      
 
-
      Frequency Discipline
-The
+
      The
 ntpd
 behavior at startup depends on whether the
 frequency file, usually
@@ -1194,8 +1205,7 @@ the file at hourly intervals.
 
 
      Operating Modes
      
 
-
      Operating Modes
-The
+
      The
 ntpd
 utility can operate in any of several modes, including
 symmetric active/passive, client/server broadcast/multicast and
@@ -1250,7 +1260,8 @@ However, this program does not have the crafted signal
 processing, error checking and mitigation algorithms of
 ntpd. 
 The
--q option is intended for this purpose. 
+-q
+option is intended for this purpose. 
 Setting this option will cause
 ntpd
 to exit just after
@@ -1258,8 +1269,10 @@ 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
-iburst keyword with the
-server configuration command. 
+iburst
+keyword with the
+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. 
@@ -1273,8 +1286,7 @@ retired.
 
   
      When kernel support is available to discipline the clock
 frequency, which is the case for stock Solaris, Tru64, Linux and
-.Fx
-,
+Fx,
 a useful feature is available to discipline the clock
 frequency. 
 First,
@@ -1299,8 +1311,7 @@ frequency.
 
 
      Poll Interval Control
      
 
-
      Poll Interval Control
-This version of NTP includes an intricate state machine to
+
      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
@@ -1311,10 +1322,13 @@ 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
-tinker minpoll command to a value not less than 16 s. 
+tinker
+minpoll
+command to a value not less than 16 s. 
 This value is used for all
 configured associations, unless overridden by the
-minpoll option on the configuration command. 
+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
@@ -1351,8 +1365,7 @@ on subsequent daemon restarts.
 
 
      The huff-n'-puff Filter
      
 
-
      The huff-n'-puff Filter
-In scenarios where a considerable amount of data are to be
+
      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
@@ -1380,8 +1393,10 @@ and positive (puff) correction, which depends on the sign of the
 offset.
 
   
      The filter is activated by the
-tinker command and
-huffpuff keyword, as described in
+tinker
+command and
+huffpuff
+keyword, as described in
 ntp.conf(5). 
 
      
 
      
@@ -1394,9 +1409,9 @@ Up: ntpd Invocation
 
      ntpd Files
      
 
      
      
-
      Pa
      the default name of the configuration file
-
      Pa
      the default name of the drift file
-
      Pa
      the default name of the key file
+
      /etc/ntp.conf
      the default name of the configuration file
+
      /etc/ntp.drift
      the default name of the drift file
+
      /etc/ntp.keys
      the default name of the key file
 
      
 
      
 
      
@@ -1416,146 +1431,23 @@ Up: ntpd Invocation
   
      In addition to the manual pages provided,
 comprehensive documentation is available on the world wide web
 at
-.Li
-http://www.ntp.org/
-. 
+http://www.ntp.org/. 
 A snapshot of this documentation is available in HTML format in
 /usr/share/doc/ntp. 
-.Rs
-.%A
-David
-L. 
-Mills
-.%T
-Network
-Time
-Protocol
-(Version
-1)
-.%O
-RFC1059
-.Re
-.Rs
-.%A
-David
-L. 
-Mills
-.%T
-Network
-Time
-Protocol
-(Version
-2)
-.%O
-RFC1119
-.Re
-.Rs
-.%A
-David
-L. 
-Mills
-.%T
-Network
-Time
-Protocol
-(Version
-3)
-.%O
-RFC1305
-.Re
-.Rs
-.%A
-David
-L. 
-Mills
-.%A
-J. 
-Martin,
-Ed. 
-.%A
-J. 
-Burbank
-.%A
-W. 
-Kasch
-.%T
-Network
-Time
-Protocol
-Version
-4:
-Protocol
-and
-Algorithms
-Specification
-.%O
-RFC5905
-.Re
-.Rs
-.%A
-David
-L. 
-Mills
-.%A
-B. 
-Haberman,
-Ed. 
-.%T
-Network
-Time
-Protocol
-Version
-4:
-Autokey
-Specification
-.%O
-RFC5906
-.Re
-.Rs
-.%A
-H. 
-Gerstung
-.%A
-C. 
-Elliott
-.%A
-B. 
-Haberman,
-Ed. 
-.%T
-Definitions
-of
-Managed
-Objects
-for
-Network
-Time
-Protocol
-Version
-4:
-(NTPv4)
-.%O
-RFC5907
-.Re
-.Rs
-.%A
-R. 
-Gayraud
-.%A
-B. 
-Lourdelet
-.%T
-Network
-Time
-Protocol
-(NTP)
-Server
-Option
-for
-DHCPv6
-.%O
-RFC5908
-.Re
+
      
+ David L. Mills, Network Time Protocol (Version 1),  RFC1059. 
+
      
+ David L. Mills, Network Time Protocol (Version 2),  RFC1119. 
+
      
+ David L. Mills, Network Time Protocol (Version 3),  RFC1305. 
+
      
+ David L. Mills,  J. Martin, Ed.,  J. Burbank,  W. Kasch, Network Time Protocol Version 4: Protocol and Algorithms Specification,  RFC5905. 
+
      
+ David L. Mills,  B. Haberman, Ed., Network Time Protocol Version 4: Autokey Specification,  RFC5906. 
+
      
+ H. Gerstung,  C. Elliott,  B. Haberman, Ed., Definitions of Managed Objects for Network Time Protocol Version 4: (NTPv4),  RFC5907. 
+
      
+ R. Gayraud,  B. Lourdelet, Network Time Protocol (NTP) Server Option for DHCPv6,  RFC5908. 
 
      
 
      
 Next: ,
diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index 602bbf997..b2181cdd6 100644
--- a/ntpd/ntpd.man.in
+++ b/ntpd/ntpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpd @NTPD_MS@ "03 Jan 2013" "4.2.7p344" "User Commands"
+.TH ntpd @NTPD_MS@ "04 Jan 2013" "4.2.7p345" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:09:18 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:02:55 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -84,7 +84,7 @@ will set the
 to 022.
 .SH "OPTIONS"
 .TP
-.BR \-4 ", " -\-ipv4
+.BR \-4 ", " \-\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
@@ -92,7 +92,7 @@ ipv6.
 Force DNS resolution of following host names on the command line
 to the IPv4 namespace.
 .TP
-.BR \-6 ", " -\-ipv6
+.BR \-6 ", " \-\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
@@ -100,7 +100,7 @@ ipv4.
 Force DNS resolution of following host names on the command line
 to the IPv6 namespace.
 .TP
-.BR \-a ", " -\-authreq
+.BR \-a ", " \-\-authreq
 Require crypto authentication.
 This option must not appear in combination with any of the following options:
 authnoreq.
@@ -109,7 +109,7 @@ Require cryptographic authentication for broadcast client,
 multicast client and symmetric passive associations.
 This is the default.
 .TP
-.BR \-A ", " -\-authnoreq
+.BR \-A ", " \-\-authnoreq
 Do not require crypto authentication.
 This option must not appear in combination with any of the following options:
 authreq.
@@ -118,7 +118,7 @@ Do not require cryptographic authentication for broadcast client,
 multicast client and symmetric passive associations.
 This is almost never a good idea.
 .TP
-.BR \-b ", " -\-bcastsync
+.BR \-b ", " \-\-bcastsync
 Allow us to sync to broadcast servers.
 .sp
 .TP
@@ -129,7 +129,7 @@ The name and path of the configuration file,
 \fI/etc/ntp.conf\fP
 by default.
 .TP
-.BR \-d ", " -\-debug\-level
+.BR \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
@@ -152,7 +152,7 @@ configuration specification in the
 \fI/etc/ntp.conf\fP
 file.
 .TP
-.BR \-g ", " -\-panicgate
+.BR \-g ", " \-\-panicgate
 Allow the first adjustment to be Big.
 This option may appear an unlimited number of times.
 .sp
@@ -193,7 +193,7 @@ Open the network address given, or all the addresses associated with the
 given interface name.  This option may appear multiple times.  This option
 also implies not opening other addresses, except wildcard and localhost.
 This option is deprecated. Please consider using the configuration file
-\fBinterface\fP command, which is more versatile.
+\fBinterface\fP command, which is more versatile. 
 .TP
 .BR \-k " \fIstring\fP, " \-\-keyfile "=" \fIstring\fP
 path to symmetric keys.
@@ -214,7 +214,7 @@ This is the same operation as the
 \fBlogfile\fP \fIlogfile\fP
 configuration file directive.
 .TP
-.BR \-L ", " -\-novirtualips
+.BR \-L ", " \-\-novirtualips
 Do not listen to virtual interfaces.
 .sp
 Do not listen to virtual interfaces, defined as those with
@@ -222,20 +222,20 @@ names containing a colon.  This option is deprecated.  Please
 consider using the configuration file \fBinterface\fP command, which
 is more versatile.
 .TP
-.BR \-M ", " -\-modifymmtimer
+.BR \-M ", " \-\-modifymmtimer
 Modify Multimedia Timer (Windows only).
 .sp
 Set the Windows Multimedia Timer to highest resolution.  This
 ensures the resolution does not change while ntpd is running,
 avoiding timekeeping glitches associated with changes.
 .TP
-.BR \-n ", " -\-nofork
+.BR \-n ", " \-\-nofork
 Do not fork.
 This option must not appear in combination with any of the following options:
 wait-sync.
 .sp
 .TP
-.BR \-N ", " -\-nice
+.BR \-N ", " \-\-nice
 Run at high priority.
 .sp
 To the extent permitted by the operating system, run
@@ -262,7 +262,7 @@ at the specified
 \fBsched_setscheduler(SCHED_FIFO)\fP
 priority.
 .TP
-.BR \-q ", " -\-quit
+.BR \-q ", " \-\-quit
 Set the time and quit.
 This option must not appear in combination with any of the following options:
 saveconfigquit, wait-sync.
@@ -351,7 +351,7 @@ otherwise it is \fBETIMEDOUT\fP.
 This provides the option for a script starting \fBntpd\fP to easily
 wait for the first set of the clock before proceeding.
 .TP
-.BR \-x ", " -\-slew
+.BR \-x ", " \-\-slew
 Slew up to 600 seconds.
 .sp
 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.
@@ -383,7 +383,7 @@ Force substitution the CPU counter for \fBQueryPerformanceCounter\fP.
 The CPU counter (RDTSC on x86) is used unconditionally with the
 given frequency (in Hz).
 .TP
-.BR \-m ", " -\-mdns
+.BR \-m ", " \-\-mdns
 Register with mDNS as a NTP server.
 .sp
 Registers as an NTP server with the local mDNS server which allows
@@ -406,6 +406,25 @@ by loading values from environment variables named:
   \fBNTPD_\fP or \fBNTPD\fP
 .fi
 .ad
+cvt_prog='/usr/local/gnu/share/autogen/texi2man'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation-notes environment files examples exit-status errors
+        compatibility see-also conforming-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH USAGE
 .SS "How NTP Operates"
 The
@@ -832,6 +851,10 @@ Successful program execution.
 .TP
 .BR 1 " (EXIT_FAILURE)"
 The operation failed or the command syntax was not valid.
+.TP
+.BR 70 " (EX_SOFTWARE)"
+libopts had an internal operational error.  Please report
+it to autogen-users@lists.sourceforge.net.  Thank you.
 .SH "SEE ALSO"
 .Xr ntp.conf 5 ,
 .Xr ntpdate 8 ,
@@ -903,8 +926,7 @@ 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
 .SH NOTES
-This document corresponds to version @VERSION@ of NTP.
-Portions of this document came from FreeBSD.
-.PP
+This document corresponds to version 4.2.7p345 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 e42706255..d57cd40ba 100644
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 3 2013
+.Dd January 4 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  3, 2013 at 01:09:34 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:03:12 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -14,7 +14,7 @@
 .\" Mixture of short (flag) options and long options
 .Op Fl flags
 .Op Fl flag Ar value
-.Op Fl \-option-name Ar value
+.Op Fl \-option\-name Ar value
 [  ...  ]
 .Pp
 .Sh DESCRIPTION
@@ -24,15 +24,15 @@ utility is an operating system daemon which sets
 and maintains the system time of day in synchronism with Internet
 standard time servers.
 It is a complete implementation of the
-Network Time Protocol (NTP) version 4, as defined by RFC-5905,
+Network Time Protocol (NTP) version 4, as defined by RFC\-5905,
 but also retains compatibility with
-version 3, as defined by RFC-1305, and versions 1
-and 2, as defined by RFC-1059 and RFC-1119, respectively.
+version 3, as defined by RFC\-1305, and versions 1
+and 2, as defined by RFC\-1059 and RFC\-1119, respectively.
 .Pp
 The
 .Nm
-utility does most computations in 64-bit floating point
-arithmetic and does relatively clumsy 64-bit fixed point operations
+utility does most computations in 64\-bit floating point
+arithmetic and does relatively clumsy 64\-bit fixed point operations
 only when necessary to preserve the ultimate precision, about 232
 picoseconds.
 While the ultimate precision is not achievable with
@@ -88,21 +88,21 @@ will set the
 to 022.
 .Sh "OPTIONS"
 .Bl -tag
-.It  \-4 ", " -\-ipv4
+.It  \-4 ", " \-\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
 .sp
 Force DNS resolution of following host names on the command line
 to the IPv4 namespace.
-.It  \-6 ", " -\-ipv6
+.It  \-6 ", " \-\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
 .sp
 Force DNS resolution of following host names on the command line
 to the IPv6 namespace.
-.It  \-a ", " -\-authreq
+.It  \-a ", " \-\-authreq
 Require crypto authentication.
 This option must not appear in combination with any of the following options:
 authnoreq.
@@ -110,7 +110,7 @@ authnoreq.
 Require cryptographic authentication for broadcast client,
 multicast client and symmetric passive associations.
 This is the default.
-.It  \-A ", " -\-authnoreq
+.It  \-A ", " \-\-authnoreq
 Do not require crypto authentication.
 This option must not appear in combination with any of the following options:
 authreq.
@@ -118,27 +118,24 @@ authreq.
 Do not require cryptographic authentication for broadcast client,
 multicast client and symmetric passive associations.
 This is almost never a good idea.
-.It  \-b ", " -\-bcastsync
+.It  \-b ", " \-\-bcastsync
 Allow us to sync to broadcast servers.
 .sp
-.sp
 .It  \-c " \fIstring\fP, " \-\-configfile "=" \fIstring\fP
 configuration file name.
 .sp
 The name and path of the configuration file,
 \fI/etc/ntp.conf\fP
 by default.
-.It  \-d ", " -\-debug\-level
+.It  \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-.sp
 .It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
-.sp
 .It  \-f " \fIstring\fP, " \-\-driftfile "=" \fIstring\fP
 frequency drift file name.
 .sp
@@ -150,7 +147,7 @@ This is the same operation as the
 configuration specification in the 
 \fI/etc/ntp.conf\fP
 file.
-.It  \-g ", " -\-panicgate
+.It  \-g ", " \-\-panicgate
 Allow the first adjustment to be Big.
 This option may appear an unlimited number of times.
 .sp
@@ -189,7 +186,7 @@ Open the network address given, or all the addresses associated with the
 given interface name.  This option may appear multiple times.  This option
 also implies not opening other addresses, except wildcard and localhost.
 This option is deprecated. Please consider using the configuration file
-\fBinterface\fP command, which is more versatile.
+\fBinterface\fP command, which is more versatile. 
 .It  \-k " \fIstring\fP, " \-\-keyfile "=" \fIstring\fP
 path to symmetric keys.
 .sp
@@ -207,26 +204,25 @@ The default is the system log file.
 This is the same operation as the
 \fBlogfile\fP \fIlogfile\fP
 configuration file directive.
-.It  \-L ", " -\-novirtualips
+.It  \-L ", " \-\-novirtualips
 Do not listen to virtual interfaces.
 .sp
 Do not listen to virtual interfaces, defined as those with
 names containing a colon.  This option is deprecated.  Please
 consider using the configuration file \fBinterface\fP command, which
 is more versatile.
-.It  \-M ", " -\-modifymmtimer
+.It  \-M ", " \-\-modifymmtimer
 Modify Multimedia Timer (Windows only).
 .sp
 Set the Windows Multimedia Timer to highest resolution.  This
 ensures the resolution does not change while ntpd is running,
 avoiding timekeeping glitches associated with changes.
-.It  \-n ", " -\-nofork
+.It  \-n ", " \-\-nofork
 Do not fork.
 This option must not appear in combination with any of the following options:
-wait-sync.
-.sp
+wait\-sync.
 .sp
-.It  \-N ", " -\-nice
+.It  \-N ", " \-\-nice
 Run at high priority.
 .sp
 To the extent permitted by the operating system, run
@@ -250,10 +246,10 @@ To the extent permitted by the operating system, run
 at the specified
 \fBsched_setscheduler(SCHED_FIFO)\fP
 priority.
-.It  \-q ", " -\-quit
+.It  \-q ", " \-\-quit
 Set the time and quit.
 This option must not appear in combination with any of the following options:
-saveconfigquit, wait-sync.
+saveconfigquit, wait\-sync.
 .sp
 \fBntpd\fP
 will not daemonize and will exit after the clock is first
@@ -273,7 +269,7 @@ Specify the default propagation delay from the broadcast/multicast server to thi
 .It  \-\-saveconfigquit "=\fIstring\fP"
 Save parsed configuration and quit.
 This option must not appear in combination with any of the following options:
-quit, wait-sync.
+quit, wait\-sync.
 .sp
 Cause \fBntpd\fP to parse its startup configuration file and save an
 equivalent to the given filename and exit.  This option was
@@ -311,12 +307,10 @@ Use 0 to disable scanning. 60 seconds is the minimum time between scans.
 make ARG an ntp variable (RW).
 This option may appear an unlimited number of times.
 .sp
-.sp
 .It  \-\-dvar "=\fIndvar\fP"
 make ARG an ntp variable (RW|DEF).
 This option may appear an unlimited number of times.
 .sp
-.sp
 .It  \-w " \fInumber\fP, " \-\-wait\-sync "=" \fInumber\fP
 Seconds to wait for first clock sync.
 This option must not appear in combination with any of the following options:
@@ -331,7 +325,7 @@ status is zero (success) if the clock was synchronized,
 otherwise it is \fBETIMEDOUT\fP.
 This provides the option for a script starting \fBntpd\fP to easily
 wait for the first set of the clock before proceeding.
-.It  \-x ", " -\-slew
+.It  \-x ", " \-\-slew
 Slew up to 600 seconds.
 .sp
 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.
@@ -360,14 +354,14 @@ Force CPU cycle counter use (Windows only).
 Force substitution the CPU counter for \fBQueryPerformanceCounter\fP.
 The CPU counter (RDTSC on x86) is used unconditionally with the
 given frequency (in Hz).
-.It  \-m ", " -\-mdns
+.It  \-m ", " \-\-mdns
 Register with mDNS as a NTP server.
 .sp
 Registers as an NTP server with the local mDNS server which allows
 the server to be discovered via mDNS client lookup.
 .It \-? , " \-\-help"
 Display usage information and exit.
-.It \-! , " \-\-more-help"
+.It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
 .It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 Output version of program and exit.  The default mode is `v', a simple
@@ -378,9 +372,28 @@ print the full copyright notice.
 Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from environment variables named:
 .nf
-  \fBNTPD_\fP or \fBNTPD\fP
+  \fBNTPD_\fP or \fBNTPD\fP
 .fi
 .ad
+cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option\-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation\-notes environment files examples exit\-status errors
+        compatibility see\-also conforming\-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end\-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end\-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh USAGE
 .Ss "How NTP Operates"
 The
@@ -408,7 +421,7 @@ command, as described in
 .Xr ntp.conf 5 .
 .Pp
 Most operating systems and hardware of today incorporate a
-time-of-year (TOY) chip to maintain the time during periods when
+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.
@@ -448,7 +461,7 @@ 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
+the synchronization distance, which is equal to one\-half the
 roundtrip delay plus error budget terms, can become very large.
 The
 .Nm
@@ -484,7 +497,7 @@ the
 .Fl x
 option.
 The maximum slew rate possible is limited
-to 500 parts-per-million (PPM) as a consequence of the correctness
+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
@@ -497,7 +510,7 @@ correctly synchronized network time.
 .Pp
 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
+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
@@ -543,7 +556,7 @@ If you can also keep a good
 .Pa ntp.drift
 file then
 .Xr ntpd 8
-will effectively "warm-start" and your system's clock will
+will effectively "warm\-start" and your system's clock will
 be stable in under 11 seconds' time.
 .Pp
 As soon as possible in the startup sequence, start
@@ -564,15 +577,15 @@ if you have processes like
 .Cm dovecot
 or database servers
 that require
-monotonically-increasing time,
+monotonically\-increasing time,
 run
-.Xr ntp-wait 8
+.Xr ntp\-wait 8
 as late as possible in the boot sequence
 (perhaps with the
 .Fl v
 flag)
 and after
-.Xr ntp-wait 8
+.Xr ntp\-wait 8
 exits successfully
 it is as safe as it will ever be to start any process that require
 stable time.
@@ -621,12 +634,12 @@ provided in
 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
+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
+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
@@ -702,7 +715,7 @@ the frequency and offset to settle down.
 Then the
 .Nm
 is
-stopped and run in one-time mode as required.
+stopped and run in one\-time mode as required.
 At each startup, the
 frequency is read from the file and initializes the kernel
 frequency.
@@ -753,7 +766,7 @@ 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.
-.Ss "The huff-n'-puff Filter"
+.Ss "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.
@@ -764,7 +777,7 @@ 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.
 .Pp
-The huff-n'-puff filter is designed to correct the apparent time
+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.
@@ -805,6 +818,9 @@ One of the following exit values will be returned:
 Successful program execution.
 .It 1 " (EXIT_FAILURE)"
 The operation failed or the command syntax was not valid.
+.It 70 " (EX_SOFTWARE)"
+libopts had an internal operational error.  Please report
+it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh "SEE ALSO"
 .Xr ntp.conf 5 ,
@@ -863,22 +879,21 @@ A snapshot of this documentation is available in HTML format in
 .Sh "AUTHORS"
 The University of Delaware
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2013 The University of Delaware all rights reserved.
+Copyright (C) 1970\-2013 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh BUGS
 The
 .Nm
 utility has gotten rather fat.
 While not huge, it has gotten
-larger than might be desirable for an elevated-priority
+larger than might be desirable for an elevated\-priority
 .Nm
 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
 .Sh NOTES
-This document corresponds to version @VERSION@ of NTP.
-Portions of this document came from FreeBSD.
-.Pp
-This manual page was \fIAutoGen\fP-erated from the \fBntpd\fP
+This document corresponds to version 4.2.7p345 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 ae8b10ff6..34cc28940 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  3, 2013 at 01:09:56 PM by AutoGen 5.17.1pre11
+# It has been AutoGen-ed  January  4, 2013 at 09:03:32 AM by AutoGen 5.17.1pre11
 # 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.7p344
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p345
 USAGE:  ntpdc [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -312,8 +312,8 @@ The command line options relating to configuration and/or usage help are:
 
 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:
 
 @table @samp
 @item version
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index 3d8f36ea5..9134ba394 100644
--- a/ntpdc/ntpdc-opts.c
+++ b/ntpdc/ntpdc-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.c)
  *  
- *  It has been AutoGen-ed  January  3, 2013 at 01:09:44 PM by AutoGen 5.17.1pre11
+ *  It has been AutoGen-ed  January  4, 2013 at 09:03:20 AM by AutoGen 5.17.1pre11
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -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.7p344\n"
+/*     0 */ "ntpdc 4.2.7p345\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.7p344\n"
+/*  1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p345\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.7p344";
+/*  1846 */ "ntpdc 4.2.7p345";
 
 /*
  *  ipv4 option description with
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 119ea7ae0..ec0df8d14 100644
--- a/ntpdc/ntpdc-opts.h
+++ b/ntpdc/ntpdc-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.h)
  *  
- *  It has been AutoGen-ed  January  3, 2013 at 01:09:44 PM by AutoGen 5.17.1pre11
+ *  It has been AutoGen-ed  January  4, 2013 at 09:03:20 AM by AutoGen 5.17.1pre11
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -82,8 +82,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.7p344"
-#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p344"
+#define NTPDC_VERSION       "4.2.7p345"
+#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p345"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman
index a900b430d..67b0033d3 100644
--- a/ntpdc/ntpdc.1ntpdcman
+++ b/ntpdc/ntpdc.1ntpdcman
@@ -1,8 +1,8 @@
-.TH ntpdc 1ntpdcman "03 Jan 2013" "4.2.7p344" "User Commands"
+.TH ntpdc 1ntpdcman "04 Jan 2013" "4.2.7p345" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:09:52 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:03:28 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -33,7 +33,7 @@ ntpd's configuration file may also be specified at run time using
 .B  .
 .SH "OPTIONS"
 .TP
-.BR \-4 ", " -\-ipv4
+.BR \-4 ", " \-\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
@@ -41,7 +41,7 @@ ipv6.
 Force DNS resolution of following host names on the command line
 to the IPv4 namespace.
 .TP
-.BR \-6 ", " -\-ipv6
+.BR \-6 ", " \-\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
@@ -57,7 +57,7 @@ The following argument is interpreted as an interactive format command
 and is added to the list of commands to be executed on the specified
 host(s).
 .TP
-.BR \-d ", " -\-debug\-level
+.BR \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
@@ -68,7 +68,7 @@ This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
 .TP
-.BR \-i ", " -\-interactive
+.BR \-i ", " \-\-interactive
 Force ntpq to operate in interactive mode.
 This option must not appear in combination with any of the following options:
 command, listpeers, peers, showpeers.
@@ -76,7 +76,7 @@ command, listpeers, peers, showpeers.
 Force ntpq to operate in interactive mode.  Prompts will be written
 to the standard output and commands read from the standard input.
 .TP
-.BR \-l ", " -\-listpeers
+.BR \-l ", " \-\-listpeers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
@@ -84,13 +84,13 @@ command.
 Print a list of the peers known to the server as well as a summary of
 their state. This is equivalent to the 'listpeers' interactive command.
 .TP
-.BR \-n ", " -\-numeric
+.BR \-n ", " \-\-numeric
 numeric host addresses.
 .sp
 Output all host addresses in dotted-quad numeric format rather than
-converting to the canonical host names.
+converting to the canonical host names. 
 .TP
-.BR \-p ", " -\-peers
+.BR \-p ", " \-\-peers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
@@ -98,7 +98,7 @@ command.
 Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'peers' interactive command.
 .TP
-.BR \-s ", " -\-showpeers
+.BR \-s ", " \-\-showpeers
 Show a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
@@ -139,6 +139,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2man'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation-notes environment files examples exit-status errors
+        compatibility see-also conforming-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH USAGE
 If one or more request options are included on the command line
 when
@@ -610,7 +629,7 @@ The
 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
+preferred peer also determines the validity of the PPS signal \- if
 the preferred peer is suitable for synchronisation so is the PPS
 signal.
 .TP
diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc
index 81e32e7b4..e881625f7 100644
--- a/ntpdc/ntpdc.1ntpdcmdoc
+++ b/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd January 3 2013
+.Dd January 4 2013
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:09:58 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:03:34 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -14,7 +14,7 @@
 .\" Mixture of short (flag) options and long options
 .Op Fl flags
 .Op Fl flag Ar value
-.Op Fl \-option-name Ar value
+.Op Fl \-option\-name Ar value
 [ host ...]
 .Pp
 .Sh DESCRIPTION
@@ -37,14 +37,14 @@ ntpd's configuration file may also be specified at run time using
 .Nm .
 .Sh "OPTIONS"
 .Bl -tag
-.It  \-4 ", " -\-ipv4
+.It  \-4 ", " \-\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
 .sp
 Force DNS resolution of following host names on the command line
 to the IPv4 namespace.
-.It  \-6 ", " -\-ipv6
+.It  \-6 ", " \-\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
@@ -58,44 +58,42 @@ This option may appear an unlimited number of times.
 The following argument is interpreted as an interactive format command
 and is added to the list of commands to be executed on the specified
 host(s).
-.It  \-d ", " -\-debug\-level
+.It  \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-.sp
 .It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
-.sp
-.It  \-i ", " -\-interactive
+.It  \-i ", " \-\-interactive
 Force ntpq to operate in interactive mode.
 This option must not appear in combination with any of the following options:
 command, listpeers, peers, showpeers.
 .sp
 Force ntpq to operate in interactive mode.  Prompts will be written
 to the standard output and commands read from the standard input.
-.It  \-l ", " -\-listpeers
+.It  \-l ", " \-\-listpeers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
 .sp
 Print a list of the peers known to the server as well as a summary of
 their state. This is equivalent to the 'listpeers' interactive command.
-.It  \-n ", " -\-numeric
+.It  \-n ", " \-\-numeric
 numeric host addresses.
 .sp
 Output all host addresses in dotted\-quad numeric format rather than
-converting to the canonical host names.
-.It  \-p ", " -\-peers
+converting to the canonical host names. 
+.It  \-p ", " \-\-peers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
 .sp
 Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'peers' interactive command.
-.It  \-s ", " -\-showpeers
+.It  \-s ", " \-\-showpeers
 Show a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
@@ -104,15 +102,15 @@ Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'dmpeers' interactive command.
 .It \-? , " \-\-help"
 Display usage information and exit.
-.It \-! , " \-\-more-help"
+.It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
 Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
 Load options from \fIrcfile\fP.
-The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+The \fIno\-load\-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
 .It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 Output version of program and exit.  The default mode is `v', a simple
@@ -124,7 +122,7 @@ Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  \fBNTPDC_\fP or \fBNTPDC\fP
+  \fBNTPDC_\fP or \fBNTPDC\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
@@ -132,6 +130,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option\-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation\-notes environment files examples exit\-status errors
+        compatibility see\-also conforming\-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end\-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end\-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh USAGE
 If one or more request options are included on the command line
 when
@@ -288,7 +305,7 @@ a timeout will be twice the timeout value set.
 .Ss "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
+These are read\-only commands
 in that they make no modification of the server configuration
 state.
 .Bl -tag -width indent
@@ -315,7 +332,7 @@ entry is operating in.
 A
 .Ql \&+
 denotes symmetric active, a
-.Ql \&-
+.Ql \&\-
 indicates symmetric passive, a
 .Ql \&=
 means the
@@ -338,7 +355,7 @@ name with its parameter or
 On
 .Ic hostnames
 .Cm no
-only IP-addresses
+only IP\-addresses
 will be displayed.
 .It Ic dmpeers
 A slightly different peer summary list.
@@ -366,7 +383,7 @@ or more peers.
 Most of these values are described in the NTP
 Version 2 specification.
 .It Ic pstats Ar peer_address Oo Ar ... Oc
-Show per-peer statistic counters associated with the specified
+Show per\-peer statistic counters associated with the specified
 peer(s).
 .It Ic clockinfo Ar clock_peer_address Oo Ar ... Oc
 Obtain and print information concerning a peer clock.
@@ -374,7 +391,7 @@ The
 values obtained provide information on the setting of fudge factors
 and other clock performance information.
 .It Ic kerninfo
-Obtain and print kernel phase-lock loop operating parameters.
+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.
 .It Ic loopinfo Op Cm oneline | Cm multiline
@@ -388,12 +405,12 @@ is the last offset given to the
 loop filter by the packet processing code.
 The
 .Sq frequency
-is the frequency error of the local clock in parts-per-million
+is the frequency error of the local clock in parts\-per\-million
 (ppm).
 The
 .Sq time_const
 controls the stiffness of the
-phase-lock loop and thus the speed at which it can adapt to
+phase\-lock loop and thus the speed at which it can adapt to
 oscillator drift.
 The
 .Sq watchdog timer
@@ -413,7 +430,7 @@ default.
 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.
+in the NTP Version 3 specification, RFC\-1305.
 .Pp
 The
 .Sq system flags
@@ -487,7 +504,7 @@ module.
 Print statistics counters related to memory allocation
 code.
 .It Ic iostats
-Print statistics counters maintained in the input-output
+Print statistics counters maintained in the input\-output
 module.
 .It Ic timerstats
 Print statistics counters maintained in the timer/event queue
@@ -546,7 +563,7 @@ 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
+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
@@ -582,7 +599,7 @@ The
 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
+preferred peer also determines the validity of the PPS signal \- if
 the preferred peer is suitable for synchronisation so is the PPS
 signal.
 .It Xo Ic addserver Ar peer_address
@@ -606,7 +623,7 @@ The
 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
+If a multicast address, a multicast\-capable kernel is
 required.
 .It Ic unconfig Ar peer_address Oo Ar ... Oc
 This command causes the configured bit to be removed from the
@@ -676,7 +693,7 @@ In effect, this switch opens and closes the feedback loop,
 which is useful for testing.
 The default for this flag is enable.
 .It Cm pps
-Enables the pulse-per-second (PPS) signal when frequency
+Enables the pulse\-per\-second (PPS) signal when frequency
 and time is disciplined by the precision time kernel modifications.
 See the
 .Qq A Kernel Model for Precision Timekeeping
@@ -768,7 +785,7 @@ The operation failed or the command syntax was not valid.
 A specified configuration file could not be loaded.
 .It 70 " (EX_SOFTWARE)"
 libopts had an internal operational error.  Please report
-it to autogen-users@lists.sourceforge.net.  Thank you.
+it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh "SEE ALSO"
 .Xr ntp.conf 5 ,
@@ -781,7 +798,7 @@ it to autogen-users@lists.sourceforge.net.  Thank you.
 .Sh AUTHORS
 The formatting directives in this document came from FreeBSD.
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2013 The University of Delaware all rights reserved.
+Copyright (C) 1970\-2013 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh BUGS
 The
@@ -797,5 +814,5 @@ 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
 .Sh "NOTES"
-This manual page was \fIAutoGen\fP-erated from the \fBntpdc\fP
+This manual page was \fIAutoGen\fP\-erated from the \fBntpdc\fP
 option definitions.
diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html
index b540713e5..d9d2a56ec 100644
--- a/ntpdc/ntpdc.html
+++ b/ntpdc/ntpdc.html
@@ -36,7 +36,7 @@ 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.7p344 of ntpdc.
+  
      This document applies to version 4.2.7p345 of ntpdc.
 
   
      The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -138,7 +138,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.
 
-
      ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p344
+
      ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p345
 USAGE:  ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -415,8 +415,8 @@ the associated name/value pair list (see: optionFindValue).
 
 
      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. 
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index 5bede1704..2237c0b54 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "03 Jan 2013" "4.2.7p344" "User Commands"
+.TH ntpdc @NTPDC_MS@ "04 Jan 2013" "4.2.7p345" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:09:52 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:03:28 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -33,7 +33,7 @@ ntpd's configuration file may also be specified at run time using
 .B  .
 .SH "OPTIONS"
 .TP
-.BR \-4 ", " -\-ipv4
+.BR \-4 ", " \-\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
@@ -41,7 +41,7 @@ ipv6.
 Force DNS resolution of following host names on the command line
 to the IPv4 namespace.
 .TP
-.BR \-6 ", " -\-ipv6
+.BR \-6 ", " \-\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
@@ -57,7 +57,7 @@ The following argument is interpreted as an interactive format command
 and is added to the list of commands to be executed on the specified
 host(s).
 .TP
-.BR \-d ", " -\-debug\-level
+.BR \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
@@ -68,7 +68,7 @@ This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
 .TP
-.BR \-i ", " -\-interactive
+.BR \-i ", " \-\-interactive
 Force ntpq to operate in interactive mode.
 This option must not appear in combination with any of the following options:
 command, listpeers, peers, showpeers.
@@ -76,7 +76,7 @@ command, listpeers, peers, showpeers.
 Force ntpq to operate in interactive mode.  Prompts will be written
 to the standard output and commands read from the standard input.
 .TP
-.BR \-l ", " -\-listpeers
+.BR \-l ", " \-\-listpeers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
@@ -84,13 +84,13 @@ command.
 Print a list of the peers known to the server as well as a summary of
 their state. This is equivalent to the 'listpeers' interactive command.
 .TP
-.BR \-n ", " -\-numeric
+.BR \-n ", " \-\-numeric
 numeric host addresses.
 .sp
 Output all host addresses in dotted-quad numeric format rather than
-converting to the canonical host names.
+converting to the canonical host names. 
 .TP
-.BR \-p ", " -\-peers
+.BR \-p ", " \-\-peers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
@@ -98,7 +98,7 @@ command.
 Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'peers' interactive command.
 .TP
-.BR \-s ", " -\-showpeers
+.BR \-s ", " \-\-showpeers
 Show a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
@@ -139,6 +139,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2man'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation-notes environment files examples exit-status errors
+        compatibility see-also conforming-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH USAGE
 If one or more request options are included on the command line
 when
@@ -610,7 +629,7 @@ The
 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
+preferred peer also determines the validity of the PPS signal \- if
 the preferred peer is suitable for synchronisation so is the PPS
 signal.
 .TP
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index aeee862ec..619e58c6d 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 3 2013
+.Dd January 4 2013
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:09:58 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:03:34 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -14,7 +14,7 @@
 .\" Mixture of short (flag) options and long options
 .Op Fl flags
 .Op Fl flag Ar value
-.Op Fl \-option-name Ar value
+.Op Fl \-option\-name Ar value
 [ host ...]
 .Pp
 .Sh DESCRIPTION
@@ -37,14 +37,14 @@ ntpd's configuration file may also be specified at run time using
 .Nm .
 .Sh "OPTIONS"
 .Bl -tag
-.It  \-4 ", " -\-ipv4
+.It  \-4 ", " \-\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
 .sp
 Force DNS resolution of following host names on the command line
 to the IPv4 namespace.
-.It  \-6 ", " -\-ipv6
+.It  \-6 ", " \-\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
@@ -58,44 +58,42 @@ This option may appear an unlimited number of times.
 The following argument is interpreted as an interactive format command
 and is added to the list of commands to be executed on the specified
 host(s).
-.It  \-d ", " -\-debug\-level
+.It  \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-.sp
 .It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
-.sp
-.It  \-i ", " -\-interactive
+.It  \-i ", " \-\-interactive
 Force ntpq to operate in interactive mode.
 This option must not appear in combination with any of the following options:
 command, listpeers, peers, showpeers.
 .sp
 Force ntpq to operate in interactive mode.  Prompts will be written
 to the standard output and commands read from the standard input.
-.It  \-l ", " -\-listpeers
+.It  \-l ", " \-\-listpeers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
 .sp
 Print a list of the peers known to the server as well as a summary of
 their state. This is equivalent to the 'listpeers' interactive command.
-.It  \-n ", " -\-numeric
+.It  \-n ", " \-\-numeric
 numeric host addresses.
 .sp
 Output all host addresses in dotted\-quad numeric format rather than
-converting to the canonical host names.
-.It  \-p ", " -\-peers
+converting to the canonical host names. 
+.It  \-p ", " \-\-peers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
 .sp
 Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'peers' interactive command.
-.It  \-s ", " -\-showpeers
+.It  \-s ", " \-\-showpeers
 Show a list of the peers.
 This option must not appear in combination with any of the following options:
 command.
@@ -104,15 +102,15 @@ Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'dmpeers' interactive command.
 .It \-? , " \-\-help"
 Display usage information and exit.
-.It \-! , " \-\-more-help"
+.It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
 Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
 Load options from \fIrcfile\fP.
-The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+The \fIno\-load\-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
 .It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 Output version of program and exit.  The default mode is `v', a simple
@@ -124,7 +122,7 @@ Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  \fBNTPDC_\fP or \fBNTPDC\fP
+  \fBNTPDC_\fP or \fBNTPDC\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
@@ -132,6 +130,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option\-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation\-notes environment files examples exit\-status errors
+        compatibility see\-also conforming\-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end\-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end\-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh USAGE
 If one or more request options are included on the command line
 when
@@ -288,7 +305,7 @@ a timeout will be twice the timeout value set.
 .Ss "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
+These are read\-only commands
 in that they make no modification of the server configuration
 state.
 .Bl -tag -width indent
@@ -315,7 +332,7 @@ entry is operating in.
 A
 .Ql \&+
 denotes symmetric active, a
-.Ql \&-
+.Ql \&\-
 indicates symmetric passive, a
 .Ql \&=
 means the
@@ -338,7 +355,7 @@ name with its parameter or
 On
 .Ic hostnames
 .Cm no
-only IP-addresses
+only IP\-addresses
 will be displayed.
 .It Ic dmpeers
 A slightly different peer summary list.
@@ -366,7 +383,7 @@ or more peers.
 Most of these values are described in the NTP
 Version 2 specification.
 .It Ic pstats Ar peer_address Oo Ar ... Oc
-Show per-peer statistic counters associated with the specified
+Show per\-peer statistic counters associated with the specified
 peer(s).
 .It Ic clockinfo Ar clock_peer_address Oo Ar ... Oc
 Obtain and print information concerning a peer clock.
@@ -374,7 +391,7 @@ The
 values obtained provide information on the setting of fudge factors
 and other clock performance information.
 .It Ic kerninfo
-Obtain and print kernel phase-lock loop operating parameters.
+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.
 .It Ic loopinfo Op Cm oneline | Cm multiline
@@ -388,12 +405,12 @@ is the last offset given to the
 loop filter by the packet processing code.
 The
 .Sq frequency
-is the frequency error of the local clock in parts-per-million
+is the frequency error of the local clock in parts\-per\-million
 (ppm).
 The
 .Sq time_const
 controls the stiffness of the
-phase-lock loop and thus the speed at which it can adapt to
+phase\-lock loop and thus the speed at which it can adapt to
 oscillator drift.
 The
 .Sq watchdog timer
@@ -413,7 +430,7 @@ default.
 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.
+in the NTP Version 3 specification, RFC\-1305.
 .Pp
 The
 .Sq system flags
@@ -487,7 +504,7 @@ module.
 Print statistics counters related to memory allocation
 code.
 .It Ic iostats
-Print statistics counters maintained in the input-output
+Print statistics counters maintained in the input\-output
 module.
 .It Ic timerstats
 Print statistics counters maintained in the timer/event queue
@@ -546,7 +563,7 @@ 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
+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
@@ -582,7 +599,7 @@ The
 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
+preferred peer also determines the validity of the PPS signal \- if
 the preferred peer is suitable for synchronisation so is the PPS
 signal.
 .It Xo Ic addserver Ar peer_address
@@ -606,7 +623,7 @@ The
 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
+If a multicast address, a multicast\-capable kernel is
 required.
 .It Ic unconfig Ar peer_address Oo Ar ... Oc
 This command causes the configured bit to be removed from the
@@ -676,7 +693,7 @@ In effect, this switch opens and closes the feedback loop,
 which is useful for testing.
 The default for this flag is enable.
 .It Cm pps
-Enables the pulse-per-second (PPS) signal when frequency
+Enables the pulse\-per\-second (PPS) signal when frequency
 and time is disciplined by the precision time kernel modifications.
 See the
 .Qq A Kernel Model for Precision Timekeeping
@@ -768,7 +785,7 @@ The operation failed or the command syntax was not valid.
 A specified configuration file could not be loaded.
 .It 70 " (EX_SOFTWARE)"
 libopts had an internal operational error.  Please report
-it to autogen-users@lists.sourceforge.net.  Thank you.
+it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh "SEE ALSO"
 .Xr ntp.conf 5 ,
@@ -781,7 +798,7 @@ it to autogen-users@lists.sourceforge.net.  Thank you.
 .Sh AUTHORS
 The formatting directives in this document came from FreeBSD.
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2013 The University of Delaware all rights reserved.
+Copyright (C) 1970\-2013 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh BUGS
 The
@@ -797,5 +814,5 @@ 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
 .Sh "NOTES"
-This manual page was \fIAutoGen\fP-erated from the \fBntpdc\fP
+This manual page was \fIAutoGen\fP\-erated from the \fBntpdc\fP
 option definitions.
diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi
index 3357dcca9..ee7314d56 100644
--- a/ntpq/invoke-ntpq.texi
+++ b/ntpq/invoke-ntpq.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpq.texi)
 # 
-# It has been AutoGen-ed  January  3, 2013 at 01:10:28 PM by AutoGen 5.17.1pre11
+# It has been AutoGen-ed  January  4, 2013 at 09:04:04 AM by AutoGen 5.17.1pre11
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -290,7 +290,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.7p344
+ntpq - standard NTP query program - Ver. 4.2.7p345
 USAGE:  ntpq [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -504,8 +504,8 @@ The command line options relating to configuration and/or usage help are:
 
 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:
 
 @table @samp
 @item version
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index 7a594a6c6..fc93c0640 100644
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  January  3, 2013 at 01:10:02 PM by AutoGen 5.17.1pre11
+ *  It has been AutoGen-ed  January  4, 2013 at 09:03:37 AM by AutoGen 5.17.1pre11
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
  *  ntpq option static const strings
  */
 static char const ntpq_opt_strs[1833] =
-/*     0 */ "ntpq 4.2.7p344\n"
+/*     0 */ "ntpq 4.2.7p345\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"
@@ -128,13 +128,13 @@ static char const ntpq_opt_strs[1833] =
 /*  1627 */ "no-load-opts\0"
 /*  1640 */ "no\0"
 /*  1643 */ "NTPQ\0"
-/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p344\n"
+/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p345\n"
             "USAGE:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
 /*  1769 */ "$HOME\0"
 /*  1775 */ ".\0"
 /*  1777 */ ".ntprc\0"
 /*  1784 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1818 */ "ntpq 4.2.7p344";
+/*  1818 */ "ntpq 4.2.7p345";
 
 /*
  *  ipv4 option description with
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 6f0980f3e..aa2546625 100644
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  January  3, 2013 at 01:10:02 PM by AutoGen 5.17.1pre11
+ *  It has been AutoGen-ed  January  4, 2013 at 09:03:36 AM by AutoGen 5.17.1pre11
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -81,8 +81,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.7p344"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p344"
+#define NTPQ_VERSION       "4.2.7p345"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p345"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index 2c260b3fa..2ff6a60ad 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "03 Jan 2013" "4.2.7p344" "User Commands"
+.TH ntpq 1ntpqman "04 Jan 2013" "4.2.7p345" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:10:24 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:04:00 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -273,7 +273,7 @@ retries each query once after a timeout, the total waiting time for
 a timeout will be twice the timeout value set.
 .SH "OPTIONS"
 .TP
-.BR \-4 ", " -\-ipv4
+.BR \-4 ", " \-\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
@@ -281,7 +281,7 @@ ipv6.
 Force DNS resolution of following host names on the command line
 to the IPv4 namespace.
 .TP
-.BR \-6 ", " -\-ipv6
+.BR \-6 ", " \-\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
@@ -297,7 +297,7 @@ The following argument is interpreted as an interactive format command
 and is added to the list of commands to be executed on the specified
 host(s).
 .TP
-.BR \-d ", " -\-debug\-level
+.BR \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
@@ -308,7 +308,7 @@ This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
 .TP
-.BR \-p ", " -\-peers
+.BR \-p ", " \-\-peers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
 interactive.
@@ -316,7 +316,7 @@ interactive.
 Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'peers' interactive command.
 .TP
-.BR \-i ", " -\-interactive
+.BR \-i ", " \-\-interactive
 Force ntpq to operate in interactive mode.
 This option must not appear in combination with any of the following options:
 command, peers.
@@ -324,11 +324,11 @@ command, peers.
 Force ntpq to operate in interactive mode.  Prompts will be written
 to the standard output and commands read from the standard input.
 .TP
-.BR \-n ", " -\-numeric
+.BR \-n ", " \-\-numeric
 numeric host addresses.
 .sp
 Output all host addresses in dotted-quad numeric format rather than
-converting to the canonical host names.
+converting to the canonical host names. 
 .TP
 .BR \-\-old\-rv
 Always output status line with readvar.
@@ -374,6 +374,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2man'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation-notes environment files examples exit-status errors
+        compatibility see-also conforming-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "FILES"
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index dd4b9dea1..3cb0fb19f 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd January 3 2013
+.Dd January 4 2013
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:10:30 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:04:06 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -14,7 +14,7 @@
 .\" Mixture of short (flag) options and long options
 .Op Fl flags
 .Op Fl flag Ar value
-.Op Fl \-option-name Ar value
+.Op Fl \-option\-name Ar value
 [ host ...]
 .Pp
 .Sh DESCRIPTION
@@ -30,7 +30,7 @@ page is for the NTPv4 variables.
 The program may be run either in interactive mode or controlled using
 command line arguments.
 Requests to read and write arbitrary
-variables can be assembled, with raw and pretty-printed output
+variables can be assembled, with raw and pretty\-printed output
 options being available.
 The
 .Nm
@@ -133,7 +133,7 @@ The
 command allows variables and their optional values to be added to
 the list.
 If more than one variable is to be added, the list should
-be comma-separated and not contain white space.
+be comma\-separated and not contain white space.
 The
 .Ic rmvars
 command can be used to remove individual variables from the list,
@@ -263,14 +263,14 @@ a timeout will be twice the timeout value set.
 .El
 .Sh "OPTIONS"
 .Bl -tag
-.It  \-4 ", " -\-ipv4
+.It  \-4 ", " \-\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
 .sp
 Force DNS resolution of following host names on the command line
 to the IPv4 namespace.
-.It  \-6 ", " -\-ipv6
+.It  \-6 ", " \-\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
@@ -284,36 +284,34 @@ This option may appear an unlimited number of times.
 The following argument is interpreted as an interactive format command
 and is added to the list of commands to be executed on the specified
 host(s).
-.It  \-d ", " -\-debug\-level
+.It  \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-.sp
 .It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
-.sp
-.It  \-p ", " -\-peers
+.It  \-p ", " \-\-peers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
 interactive.
 .sp
 Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'peers' interactive command.
-.It  \-i ", " -\-interactive
+.It  \-i ", " \-\-interactive
 Force ntpq to operate in interactive mode.
 This option must not appear in combination with any of the following options:
 command, peers.
 .sp
 Force ntpq to operate in interactive mode.  Prompts will be written
 to the standard output and commands read from the standard input.
-.It  \-n ", " -\-numeric
+.It  \-n ", " \-\-numeric
 numeric host addresses.
 .sp
 Output all host addresses in dotted\-quad numeric format rather than
-converting to the canonical host names.
+converting to the canonical host names. 
 .It  \-\-old\-rv
 Always output status line with readvar.
 .sp
@@ -326,15 +324,15 @@ preset this option in a script will enable both older and
 newer ntpq to behave identically in this regard.
 .It \-? , " \-\-help"
 Display usage information and exit.
-.It \-! , " \-\-more-help"
+.It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
 Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
 Load options from \fIrcfile\fP.
-The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+The \fIno\-load\-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
 .It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 Output version of program and exit.  The default mode is `v', a simple
@@ -346,7 +344,7 @@ Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  \fBNTPQ_\fP or \fBNTPQ\fP
+  \fBNTPQ_\fP or \fBNTPQ\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
@@ -354,6 +352,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option\-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation\-notes environment files examples exit\-status errors
+        compatibility see\-also conforming\-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end\-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end\-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .Sh "FILES"
@@ -369,15 +386,15 @@ The operation failed or the command syntax was not valid.
 A specified configuration file could not be loaded.
 .It 70 " (EX_SOFTWARE)"
 libopts had an internal operational error.  Please report
-it to autogen-users@lists.sourceforge.net.  Thank you.
+it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh "AUTHORS"
 The University of Delaware
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2013 The University of Delaware all rights reserved.
+Copyright (C) 1970\-2013 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh "NOTES"
-This manual page was \fIAutoGen\fP-erated from the \fBntpq\fP
+This manual page was \fIAutoGen\fP\-erated from the \fBntpq\fP
 option definitions.
diff --git a/ntpq/ntpq.html b/ntpq/ntpq.html
index 8379397ff..b5328ad40 100644
--- a/ntpq/ntpq.html
+++ b/ntpq/ntpq.html
@@ -44,7 +44,7 @@ monitor the operational status
 and determine the performance of
 ntpd, the NTP daemon.
 
-  
      This document applies to version 4.2.7p344 of ntpq.
+  
      This document applies to version 4.2.7p345 of ntpq.
 
 
        
 
      • ntpq Description
@@ -149,8 +149,10 @@ time.
 
   
        Specifying a
 command line option other than
--i or
--n will
+-i
+or
+-n
+will
 cause the specified query (queries) to be sent to the indicated
 host(s) immediately. 
 Otherwise,
@@ -165,8 +167,7 @@ interactive format commands from the standard input.
 
 
        Internal Commands
        
 
-
        Internal Commands
-Interactive format commands consist of a keyword followed by zero
+
        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.
@@ -179,13 +180,13 @@ utility itself and do not result in NTP mode 6
 requests being sent to a server. 
 These are described following.
      
        
-
        Ic
        Ic
        A
-\&? 
+
        ? [command_keyword]
        help [command_keyword]
        A
+? 
 by itself will print a list of all the command
 keywords known to this incarnation of
 ntpq. 
 A
-\&? 
+? 
 followed by a command keyword will print function and usage
 information about the command. 
 This command is probably a better
@@ -193,7 +194,11 @@ source of information about
 ntpq
 than this manual
 page. 
-
        Ic
        ... 
        Ic
        Ic
        The data carried by NTP mode 6 messages consists of a list of
+
        addvars variable_name[=value]
        ...
+
+     
        rmvarsvariable_name...
+clearvars
+The data carried by NTP mode 6 messages consists of a list of
 items of the form
 variable_name=value,
 where the
@@ -204,24 +209,30 @@ The
 ntpq
 utility maintains an internal list in which data to be included in control
 messages can be assembled, and sent using the
-readlist and
-writelist commands described below. 
+readlist
+and
+writelist
+commands described below. 
 The
-addvars command allows variables and their optional values to be added to
+addvars
+command allows variables and their optional values to be added to
 the list. 
 If more than one variable is to be added, the list should
 be comma-separated and not contain white space. 
 The
-rmvars command can be used to remove individual variables from the list,
+rmvars
+command can be used to remove individual variables from the list,
 while the
-clearlist command removes all variables from the
+clearlist
+command removes all variables from the
 list. 
-
        Ic
        Normally
+authenticate[yes]|no
+Normally
 ntpq
 does not authenticate requests unless
 they are write requests. 
 The command
-authenticate yes
+authenticateyes
 causes
 ntpq
 to send authentication with all requests it
@@ -229,7 +240,8 @@ makes.
 Authenticated requests causes some servers to handle
 requests slightly differently, and can occasionally melt the CPU in
 fuzzballs if you turn authentication on before doing a
-peer display. 
+peer
+display. 
 The command
 authenticate
 causes
@@ -237,7 +249,8 @@ causes
 to display whether or not
 ntpq
 is currently autheinticating requests. 
-
        Ic
        Causes output from query commands to be "cooked", so that
+cooked
+Causes output from query commands to be "cooked", so that
 variables which are recognized by
 ntpq
 will have their
@@ -246,12 +259,12 @@ Variables which
 ntpq
 thinks should have a decodable value but didn't are
 marked with a trailing
-\&?. 
-
        Xo
        debug .Oo
-more | less | off .Oc
+?. 
+debugOomore|less|offOc
 With no argument, displays the current debug level. 
 Otherwise, the debug level is changed to the indicated level. 
-
        Ic
        Specify a time interval to be added to timestamps included in
+delaymilliseconds
+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
@@ -259,25 +272,39 @@ or between machines whose clocks are unsynchronized.
 Actually the
 server does not now require timestamps in authenticated requests,
 so this command may be obsolete. 
-
        Ic
        Set the host to which future queries will be sent. 
-hostname may be either a host name or a numeric address. 
-
        Ic
        If
-yes is specified, host names are printed in
+hosthostname
+Set the host to which future queries will be sent. 
+hostname
+may be either a host name or a numeric address. 
+hostnames[yes|Cmno]
+If
+yes
+is specified, host names are printed in
 information displays. 
 If
-no is specified, numeric
+no
+is specified, numeric
 addresses are printed instead. 
 The default is
-yes, unless
+yes,
+unless
 modified using the command line
--n switch. 
-
        Ic
        This command allows the specification of a key number to be
+-n
+switch. 
+keyidkeyid
+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. 
-
        Ic
        1 | 2 | 3 | 4 .Oc
-Sets the NTP version number which
+ntpversionOo
+1|
+2|
+3|
+4
+Oc
+
+     
        Sets the NTP version number which
 ntpq
 claims in
 packets. 
@@ -287,20 +314,24 @@ There appear
 to be no servers left which demand version 1. 
 With no argument, displays the current NTP version that will be used
 when communicating with servers. 
-
        Ic
        Exit
+quit
+Exit
 ntpq
-
        Ic
        This command prompts you to type in a password (which will not
+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. 
-
        Ic
        Causes all output from query commands is printed as received
+raw
+Causes all output from query commands is printed as received
 from the remote server. 
 The only formating/interpretation done on
 the data is to transform nonascii data into a printable (but barely
 understandable) form. 
-
        Ic
        Specify a timeout period for responses to server queries. 
+timeoutmilliseconds
+Specify a timeout period for responses to server queries. 
 The
 default is about 5000 milliseconds. 
 Note that since
@@ -346,7 +377,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.
 
-
        ntpq - standard NTP query program - Ver. 4.2.7p343
+
        ntpq - standard NTP query program - Ver. 4.2.7p344
 USAGE:  ntpq [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index 2b7a2ac62..89250b07b 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -1,8 +1,8 @@
-.TH ntpq @NTPQ_MS@ "03 Jan 2013" "4.2.7p344" "User Commands"
+.TH ntpq @NTPQ_MS@ "04 Jan 2013" "4.2.7p345" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:10:24 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:04:00 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -273,7 +273,7 @@ retries each query once after a timeout, the total waiting time for
 a timeout will be twice the timeout value set.
 .SH "OPTIONS"
 .TP
-.BR \-4 ", " -\-ipv4
+.BR \-4 ", " \-\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
@@ -281,7 +281,7 @@ ipv6.
 Force DNS resolution of following host names on the command line
 to the IPv4 namespace.
 .TP
-.BR \-6 ", " -\-ipv6
+.BR \-6 ", " \-\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
@@ -297,7 +297,7 @@ The following argument is interpreted as an interactive format command
 and is added to the list of commands to be executed on the specified
 host(s).
 .TP
-.BR \-d ", " -\-debug\-level
+.BR \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
@@ -308,7 +308,7 @@ This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
 .TP
-.BR \-p ", " -\-peers
+.BR \-p ", " \-\-peers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
 interactive.
@@ -316,7 +316,7 @@ interactive.
 Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'peers' interactive command.
 .TP
-.BR \-i ", " -\-interactive
+.BR \-i ", " \-\-interactive
 Force ntpq to operate in interactive mode.
 This option must not appear in combination with any of the following options:
 command, peers.
@@ -324,11 +324,11 @@ command, peers.
 Force ntpq to operate in interactive mode.  Prompts will be written
 to the standard output and commands read from the standard input.
 .TP
-.BR \-n ", " -\-numeric
+.BR \-n ", " \-\-numeric
 numeric host addresses.
 .sp
 Output all host addresses in dotted-quad numeric format rather than
-converting to the canonical host names.
+converting to the canonical host names. 
 .TP
 .BR \-\-old\-rv
 Always output status line with readvar.
@@ -374,6 +374,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2man'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation-notes environment files examples exit-status errors
+        compatibility see-also conforming-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "FILES"
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index 4c240e728..dcfc4acd7 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 3 2013
+.Dd January 4 2013
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:10:30 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:04:06 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -14,7 +14,7 @@
 .\" Mixture of short (flag) options and long options
 .Op Fl flags
 .Op Fl flag Ar value
-.Op Fl \-option-name Ar value
+.Op Fl \-option\-name Ar value
 [ host ...]
 .Pp
 .Sh DESCRIPTION
@@ -30,7 +30,7 @@ page is for the NTPv4 variables.
 The program may be run either in interactive mode or controlled using
 command line arguments.
 Requests to read and write arbitrary
-variables can be assembled, with raw and pretty-printed output
+variables can be assembled, with raw and pretty\-printed output
 options being available.
 The
 .Nm
@@ -133,7 +133,7 @@ The
 command allows variables and their optional values to be added to
 the list.
 If more than one variable is to be added, the list should
-be comma-separated and not contain white space.
+be comma\-separated and not contain white space.
 The
 .Ic rmvars
 command can be used to remove individual variables from the list,
@@ -263,14 +263,14 @@ a timeout will be twice the timeout value set.
 .El
 .Sh "OPTIONS"
 .Bl -tag
-.It  \-4 ", " -\-ipv4
+.It  \-4 ", " \-\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
 .sp
 Force DNS resolution of following host names on the command line
 to the IPv4 namespace.
-.It  \-6 ", " -\-ipv6
+.It  \-6 ", " \-\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
@@ -284,36 +284,34 @@ This option may appear an unlimited number of times.
 The following argument is interpreted as an interactive format command
 and is added to the list of commands to be executed on the specified
 host(s).
-.It  \-d ", " -\-debug\-level
+.It  \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-.sp
 .It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
-.sp
-.It  \-p ", " -\-peers
+.It  \-p ", " \-\-peers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
 interactive.
 .sp
 Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'peers' interactive command.
-.It  \-i ", " -\-interactive
+.It  \-i ", " \-\-interactive
 Force ntpq to operate in interactive mode.
 This option must not appear in combination with any of the following options:
 command, peers.
 .sp
 Force ntpq to operate in interactive mode.  Prompts will be written
 to the standard output and commands read from the standard input.
-.It  \-n ", " -\-numeric
+.It  \-n ", " \-\-numeric
 numeric host addresses.
 .sp
 Output all host addresses in dotted\-quad numeric format rather than
-converting to the canonical host names.
+converting to the canonical host names. 
 .It  \-\-old\-rv
 Always output status line with readvar.
 .sp
@@ -326,15 +324,15 @@ preset this option in a script will enable both older and
 newer ntpq to behave identically in this regard.
 .It \-? , " \-\-help"
 Display usage information and exit.
-.It \-! , " \-\-more-help"
+.It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
 Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
 Load options from \fIrcfile\fP.
-The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+The \fIno\-load\-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
 .It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 Output version of program and exit.  The default mode is `v', a simple
@@ -346,7 +344,7 @@ Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  \fBNTPQ_\fP or \fBNTPQ\fP
+  \fBNTPQ_\fP or \fBNTPQ\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
@@ -354,6 +352,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option\-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation\-notes environment files examples exit\-status errors
+        compatibility see\-also conforming\-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end\-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end\-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .Sh "FILES"
@@ -369,15 +386,15 @@ The operation failed or the command syntax was not valid.
 A specified configuration file could not be loaded.
 .It 70 " (EX_SOFTWARE)"
 libopts had an internal operational error.  Please report
-it to autogen-users@lists.sourceforge.net.  Thank you.
+it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh "AUTHORS"
 The University of Delaware
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2013 The University of Delaware all rights reserved.
+Copyright (C) 1970\-2013 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh "NOTES"
-This manual page was \fIAutoGen\fP-erated from the \fBntpq\fP
+This manual page was \fIAutoGen\fP\-erated from the \fBntpq\fP
 option definitions.
diff --git a/ntpsnmpd/invoke-ntpsnmpd.texi b/ntpsnmpd/invoke-ntpsnmpd.texi
index 4828504ef..3a2f6f2da 100644
--- a/ntpsnmpd/invoke-ntpsnmpd.texi
+++ b/ntpsnmpd/invoke-ntpsnmpd.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpsnmpd.texi)
 # 
-# It has been AutoGen-ed  January  3, 2013 at 01:10:45 PM by AutoGen 5.17.1pre11
+# It has been AutoGen-ed  January  4, 2013 at 09:04:19 AM by AutoGen 5.17.1pre11
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -47,7 +47,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p344
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p345
 USAGE:  ntpsnmpd [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
@@ -155,8 +155,8 @@ The command line options relating to configuration and/or usage help are:
 
 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:
 
 @table @samp
 @item version
@@ -230,7 +230,7 @@ please fill me in...
 please fill me in...
 @end table
 
-This document corresponds to version @VERSION@ of NTP.
+This document corresponds to version 4.2.7p345 of NTP.
 @node ntpsnmpd Authors
 @subsection ntpsnmpd Authors
 Heiko Gerstung@*
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index dd5052946..17c68f523 100644
--- a/ntpsnmpd/ntpsnmpd-opts.c
+++ b/ntpsnmpd/ntpsnmpd-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *  
- *  It has been AutoGen-ed  January  3, 2013 at 01:10:33 PM by AutoGen 5.17.1pre11
+ *  It has been AutoGen-ed  January  4, 2013 at 09:04:08 AM by AutoGen 5.17.1pre11
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -64,7 +64,7 @@ extern FILE * option_usage_fp;
  *  ntpsnmpd option static const strings
  */
 static char const ntpsnmpd_opt_strs[1561] =
-/*     0 */ "ntpsnmpd 4.2.7p344\n"
+/*     0 */ "ntpsnmpd 4.2.7p345\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"
@@ -103,14 +103,14 @@ static char const ntpsnmpd_opt_strs[1561] =
 /*  1360 */ "no-load-opts\0"
 /*  1373 */ "no\0"
 /*  1376 */ "NTPSNMPD\0"
-/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p344\n"
+/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p345\n"
             "USAGE:  %s [ - [] | --[{=| }] ]...\n\0"
 /*  1490 */ "$HOME\0"
 /*  1496 */ ".\0"
 /*  1498 */ ".ntprc\0"
 /*  1505 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1539 */ "\n\n\0"
-/*  1542 */ "ntpsnmpd 4.2.7p344";
+/*  1542 */ "ntpsnmpd 4.2.7p345";
 
 /*
  *  nofork option description:
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index e13dba6f6..a9276cf94 100644
--- a/ntpsnmpd/ntpsnmpd-opts.h
+++ b/ntpsnmpd/ntpsnmpd-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *  
- *  It has been AutoGen-ed  January  3, 2013 at 01:10:33 PM by AutoGen 5.17.1pre11
+ *  It has been AutoGen-ed  January  4, 2013 at 09:04:08 AM by AutoGen 5.17.1pre11
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -75,8 +75,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.7p344"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p344"
+#define NTPSNMPD_VERSION       "4.2.7p345"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p345"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index 23cfc9a46..6dcbffb6a 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "03 Jan 2013" "4.2.7p344" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "04 Jan 2013" "4.2.7p345" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:10:41 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:04:16 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -21,11 +21,11 @@ is an SNMP MIB agent designed to interface with
 .Xr ntpd 1ntpdmdoc .
 .SH "OPTIONS"
 .TP
-.BR \-n ", " -\-nofork
+.BR \-n ", " \-\-nofork
 Do not fork.
 .sp
 .TP
-.BR \-p ", " -\-syslog
+.BR \-p ", " \-\-syslog
 Log to syslog().
 .sp
 .TP
@@ -73,6 +73,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2man'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation-notes environment files examples exit-status errors
+        compatibility see-also conforming-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH USAGE
 .B 
 currently uses a private MIB OID,
@@ -87,7 +106,7 @@ when the NTPv4 MIB RFC is standardized.
 If you have
 .Xr snmpwalk 1
 installed you can run
-.Dl % snmpwalk -v2c -c public localhost enterprises.5597.99
+.Dl % snmpwalk \-v2c \-c public localhost enterprises.5597.99
 to see a list of all currently supported NTP MIB objects
 and their current values.
 .SH "ENVIRONMENT"
@@ -150,7 +169,6 @@ please fill me in...
 .BR Li ntpEntTimeDistance
 please fill me in...
 .PP
-This document corresponds to version @VERSION@ of NTP.
-.PP
+This document corresponds to version 4.2.7p345 of NTP..Pp
 This manual page was \fIAutoGen\fP-erated from the \fBntpsnmpd\fP
 option definitions.
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index 40001baf4..99aae0a76 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd January 3 2013
+.Dd January 4 2013
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:10:47 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:04:21 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -14,7 +14,7 @@
 .\" Mixture of short (flag) options and long options
 .Op Fl flags
 .Op Fl flag Ar value
-.Op Fl \-option-name Ar value
+.Op Fl \-option\-name Ar value
 .Pp
 All arguments must be options.
 .Pp
@@ -24,14 +24,12 @@ is an SNMP MIB agent designed to interface with
 .Xr ntpd 1ntpdmdoc .
 .Sh "OPTIONS"
 .Bl -tag
-.It  \-n ", " -\-nofork
+.It  \-n ", " \-\-nofork
 Do not fork.
 .sp
-.sp
-.It  \-p ", " -\-syslog
+.It  \-p ", " \-\-syslog
 Log to syslog().
 .sp
-.sp
 .It  \-\-agentxsocket "=\fIstring\fP"
 The socket address ntpsnmpd uses to connect to net\-snmpd.
 The default \fIstring\fP for this option is:
@@ -44,15 +42,15 @@ The default "agent X socket" is the Unix Domain socket
 Another common alternative is \fItcp:localhost:705\fP.
 .It \-? , " \-\-help"
 Display usage information and exit.
-.It \-! , " \-\-more-help"
+.It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
 Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
 Load options from \fIrcfile\fP.
-The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+The \fIno\-load\-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
 .It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 Output version of program and exit.  The default mode is `v', a simple
@@ -64,7 +62,7 @@ Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  \fBNTPSNMPD_\fP or \fBNTPSNMPD\fP
+  \fBNTPSNMPD_\fP or \fBNTPSNMPD\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
@@ -72,6 +70,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option\-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation\-notes environment files examples exit\-status errors
+        compatibility see\-also conforming\-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end\-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end\-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh USAGE
 .Nm
 currently uses a private MIB OID,
@@ -86,7 +103,7 @@ when the NTPv4 MIB RFC is standardized.
 If you have
 .Xr snmpwalk 1
 installed you can run
-.Dl % snmpwalk -v2c -c public localhost enterprises.5597.99
+.Dl % snmpwalk \-v2c \-c public localhost enterprises.5597.99
 to see a list of all currently supported NTP MIB objects
 and their current values.
 .Sh "ENVIRONMENT"
@@ -104,12 +121,12 @@ The operation failed or the command syntax was not valid.
 A specified configuration file could not be loaded.
 .It 70 " (EX_SOFTWARE)"
 libopts had an internal operational error.  Please report
-it to autogen-users@lists.sourceforge.net.  Thank you.
+it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh AUTHORS
 .An "Heiko Gerstung"
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2013 The University of Delaware all rights reserved.
+Copyright (C) 1970\-2013 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
@@ -139,7 +156,6 @@ please fill me in...
 please fill me in...
 .El
 .Pp
-This document corresponds to version @VERSION@ of NTP.
-.Pp
-This manual page was \fIAutoGen\fP-erated from the \fBntpsnmpd\fP
+This document corresponds to version 4.2.7p345 of NTP..Pp
+This manual page was \fIAutoGen\fP\-erated from the \fBntpsnmpd\fP
 option definitions.
diff --git a/ntpsnmpd/ntpsnmpd.html b/ntpsnmpd/ntpsnmpd.html
index 6c7fa4101..0bce33c4a 100644
--- a/ntpsnmpd/ntpsnmpd.html
+++ b/ntpsnmpd/ntpsnmpd.html
@@ -42,7 +42,7 @@ Up: (dir)
 
        The ntpsnmpd utility program is used to monitor NTP daemon ntpd
 operations and determine performance.  It uses the standard NTP mode 6 control
 
-  
        This document applies to version 4.2.7p344 of ntpsnmpd.
+  
        This document applies to version 4.2.7p345 of ntpsnmpd.
 
 
          
 
        • ntpsnmpd Description:             Description
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index a00a05ddd..04ff884a5 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpsnmpd @NTPSNMPD_MS@ "03 Jan 2013" "4.2.7p344" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "04 Jan 2013" "4.2.7p345" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:10:41 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:04:16 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -21,11 +21,11 @@ is an SNMP MIB agent designed to interface with
 .Xr ntpd @NTPD_MS@ .
 .SH "OPTIONS"
 .TP
-.BR \-n ", " -\-nofork
+.BR \-n ", " \-\-nofork
 Do not fork.
 .sp
 .TP
-.BR \-p ", " -\-syslog
+.BR \-p ", " \-\-syslog
 Log to syslog().
 .sp
 .TP
@@ -73,6 +73,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2man'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation-notes environment files examples exit-status errors
+        compatibility see-also conforming-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH USAGE
 .B 
 currently uses a private MIB OID,
@@ -87,7 +106,7 @@ when the NTPv4 MIB RFC is standardized.
 If you have
 .Xr snmpwalk 1
 installed you can run
-.Dl % snmpwalk -v2c -c public localhost enterprises.5597.99
+.Dl % snmpwalk \-v2c \-c public localhost enterprises.5597.99
 to see a list of all currently supported NTP MIB objects
 and their current values.
 .SH "ENVIRONMENT"
@@ -150,7 +169,6 @@ please fill me in...
 .BR Li ntpEntTimeDistance
 please fill me in...
 .PP
-This document corresponds to version @VERSION@ of NTP.
-.PP
+This document corresponds to version 4.2.7p345 of NTP..Pp
 This manual page was \fIAutoGen\fP-erated from the \fBntpsnmpd\fP
 option definitions.
diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in
index 085fcd417..8cfb9fd90 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 3 2013
+.Dd January 4 2013
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:10:47 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:04:21 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -14,7 +14,7 @@
 .\" Mixture of short (flag) options and long options
 .Op Fl flags
 .Op Fl flag Ar value
-.Op Fl \-option-name Ar value
+.Op Fl \-option\-name Ar value
 .Pp
 All arguments must be options.
 .Pp
@@ -24,14 +24,12 @@ is an SNMP MIB agent designed to interface with
 .Xr ntpd @NTPD_MS@ .
 .Sh "OPTIONS"
 .Bl -tag
-.It  \-n ", " -\-nofork
+.It  \-n ", " \-\-nofork
 Do not fork.
 .sp
-.sp
-.It  \-p ", " -\-syslog
+.It  \-p ", " \-\-syslog
 Log to syslog().
 .sp
-.sp
 .It  \-\-agentxsocket "=\fIstring\fP"
 The socket address ntpsnmpd uses to connect to net\-snmpd.
 The default \fIstring\fP for this option is:
@@ -44,15 +42,15 @@ The default "agent X socket" is the Unix Domain socket
 Another common alternative is \fItcp:localhost:705\fP.
 .It \-? , " \-\-help"
 Display usage information and exit.
-.It \-! , " \-\-more-help"
+.It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
 Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
 Load options from \fIrcfile\fP.
-The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+The \fIno\-load\-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
 .It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 Output version of program and exit.  The default mode is `v', a simple
@@ -64,7 +62,7 @@ Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  \fBNTPSNMPD_\fP or \fBNTPSNMPD\fP
+  \fBNTPSNMPD_\fP or \fBNTPSNMPD\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
@@ -72,6 +70,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option\-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation\-notes environment files examples exit\-status errors
+        compatibility see\-also conforming\-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end\-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end\-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh USAGE
 .Nm
 currently uses a private MIB OID,
@@ -86,7 +103,7 @@ when the NTPv4 MIB RFC is standardized.
 If you have
 .Xr snmpwalk 1
 installed you can run
-.Dl % snmpwalk -v2c -c public localhost enterprises.5597.99
+.Dl % snmpwalk \-v2c \-c public localhost enterprises.5597.99
 to see a list of all currently supported NTP MIB objects
 and their current values.
 .Sh "ENVIRONMENT"
@@ -104,12 +121,12 @@ The operation failed or the command syntax was not valid.
 A specified configuration file could not be loaded.
 .It 70 " (EX_SOFTWARE)"
 libopts had an internal operational error.  Please report
-it to autogen-users@lists.sourceforge.net.  Thank you.
+it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh AUTHORS
 .An "Heiko Gerstung"
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2013 The University of Delaware all rights reserved.
+Copyright (C) 1970\-2013 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
@@ -139,7 +156,6 @@ please fill me in...
 please fill me in...
 .El
 .Pp
-This document corresponds to version @VERSION@ of NTP.
-.Pp
-This manual page was \fIAutoGen\fP-erated from the \fBntpsnmpd\fP
+This document corresponds to version 4.2.7p345 of NTP..Pp
+This manual page was \fIAutoGen\fP\-erated from the \fBntpsnmpd\fP
 option definitions.
diff --git a/packageinfo.sh b/packageinfo.sh
index 85eb550a9..a892ec314 100644
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -70,7 +70,7 @@ CLTAG=NTP_4_2_0
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=344
+point=345
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)
diff --git a/scripts/invoke-ntp-wait.texi b/scripts/invoke-ntp-wait.texi
index 3fee69d0d..0fd9b4ef1 100644
--- a/scripts/invoke-ntp-wait.texi
+++ b/scripts/invoke-ntp-wait.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-wait.texi)
 # 
-# It has been AutoGen-ed  January  3, 2013 at 01:06:56 PM by AutoGen 5.17.1pre11
+# It has been AutoGen-ed  January  4, 2013 at 09:00:34 AM by AutoGen 5.17.1pre11
 # From the definitions    ntp-wait-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -60,7 +60,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-/backroom/snaps/ntp-dev/A.snap/scripts/ntp-wait version [unknown] calling Getopt::Std::getopts (version 1.05 [paranoid]),
+/deacon/backroom/snaps/ntp-dev/A.snap/scripts/ntp-wait version [unknown] calling Getopt::Std::getopts (version 1.05 [paranoid]),
 running under Perl version 5.8.8.
 
 Usage: ntp-wait [-OPTIONS [-MORE_OPTIONS]] [--] [PROGRAM_ARG1 ...]
@@ -118,8 +118,8 @@ The command line options relating to configuration and/or usage help are:
 
 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:
 
 @table @samp
 @item version
@@ -145,4 +145,4 @@ The operation failed or the command syntax was not valid.
 Harlan Stenn@*
 @node ntp-wait Notes
 @subsection ntp-wait Notes
-This document corresponds to version @VERSION@ of NTP.
+This document corresponds to version 4.2.7p345 of NTP.
diff --git a/scripts/ntp-wait.1ntp-waitman b/scripts/ntp-wait.1ntp-waitman
index 4948abf44..76ae1f15d 100644
--- a/scripts/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait.1ntp-waitman
@@ -1,8 +1,8 @@
-.TH ntp-wait 1ntp-waitman "03 Jan 2013" "ntp (4.2.7p344)" "User Commands"
+.TH ntp-wait 1ntp-waitman "04 Jan 2013" "ntp (4.2.7p345)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:06:52 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:00:30 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -53,7 +53,7 @@ The default \fIsecs\-between\-tries\fP for this option is:
 We will sleep for \fIsecs-between-tries\fP after each query of ntpd
 that returns "the time is not yet stable".
 .TP
-.BR \-v ", " -\-
+.BR \-v ", " \-\-
 Be verbose.
 .sp
 By default, ntp-wait is silent.  With this option, ntp-wait
@@ -76,6 +76,25 @@ by loading values from environment variables named:
   \fBNTP_WAIT_\fP or \fBNTP_WAIT\fP
 .fi
 .ad
+cvt_prog='/usr/local/gnu/share/autogen/texi2man'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation-notes environment files examples exit-status errors
+        compatibility see-also conforming-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "EXIT STATUS"
@@ -86,6 +105,10 @@ Successful program execution.
 .TP
 .BR 1 " (EXIT_FAILURE)"
 The operation failed or the command syntax was not valid.
+.TP
+.BR 70 " (EX_SOFTWARE)"
+libopts had an internal operational error.  Please report
+it to autogen-users@lists.sourceforge.net.  Thank you.
 .SH AUTHORS
 .An "Harlan Stenn"
 .SH "COPYRIGHT"
@@ -94,7 +117,6 @@ This program is released under the terms of the NTP license, \fP or \fBNTP_WAIT\fP
+  \fBNTP_WAIT_\fP or \fBNTP_WAIT\fP
 .fi
 .ad
+cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option\-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation\-notes environment files examples exit\-status errors
+        compatibility see\-also conforming\-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end\-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end\-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .Sh "EXIT STATUS"
@@ -84,16 +103,18 @@ One of the following exit values will be returned:
 Successful program execution.
 .It 1 " (EXIT_FAILURE)"
 The operation failed or the command syntax was not valid.
+.It 70 " (EX_SOFTWARE)"
+libopts had an internal operational error.  Please report
+it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh AUTHORS
 .An "Harlan Stenn"
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2013 The University of Delaware all rights reserved.
+Copyright (C) 1970\-2013 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-This document corresponds to version @VERSION@ of NTP.
-.Pp
-This manual page was \fIAutoGen\fP-erated from the \fBntp-wait\fP
+This document corresponds to version 4.2.7p345 of NTP..Pp
+This manual page was \fIAutoGen\fP\-erated from the \fBntp\-wait\fP
 option definitions.
diff --git a/scripts/ntp-wait.html b/scripts/ntp-wait.html
index 13d592e0b..a6754ac10 100644
--- a/scripts/ntp-wait.html
+++ b/scripts/ntp-wait.html
@@ -41,7 +41,7 @@ until the system's time has stabilized and synchronized,
 and only then start any applicaitons (like database servers) that require
 accurate and stable time.
 
-  
          This document applies to version 4.2.7p344 of ntp-wait.
+  
          This document applies to version 4.2.7p345 of ntp-wait.
 
   
          
 
          Short Contents
          
@@ -129,7 +129,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.
 
-
          /backroom/snaps/ntp-dev/A.snap/scripts/ntp-wait version [unknown] calling Getopt::Std::getopts (version 1.05 [paranoid]),
+
          /deacon/backroom/snaps/ntp-dev/A.snap/scripts/ntp-wait version [unknown] calling Getopt::Std::getopts (version 1.05 [paranoid]),
 running under Perl version 5.8.8.
 
 Usage: ntp-wait [-OPTIONS [-MORE_OPTIONS]] [--] [PROGRAM_ARG1 ...]
@@ -211,8 +211,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. 
@@ -255,7 +255,7 @@ Up: ntp-wait Invo
 
 
          ntp-wait Notes
          
 
-
          This document corresponds to version  of NTP.
+
          This document corresponds to version 4.2.7p345 of NTP.
 
 
 
diff --git a/scripts/ntp-wait.man.in b/scripts/ntp-wait.man.in
index d3321e3ad..f4c2e1c32 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "03 Jan 2013" "ntp (4.2.7p344)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "04 Jan 2013" "ntp (4.2.7p345)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:06:52 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:00:30 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -53,7 +53,7 @@ The default \fIsecs\-between\-tries\fP for this option is:
 We will sleep for \fIsecs-between-tries\fP after each query of ntpd
 that returns "the time is not yet stable".
 .TP
-.BR \-v ", " -\-
+.BR \-v ", " \-\-
 Be verbose.
 .sp
 By default, ntp-wait is silent.  With this option, ntp-wait
@@ -76,6 +76,25 @@ by loading values from environment variables named:
   \fBNTP_WAIT_\fP or \fBNTP_WAIT\fP
 .fi
 .ad
+cvt_prog='/usr/local/gnu/share/autogen/texi2man'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation-notes environment files examples exit-status errors
+        compatibility see-also conforming-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH "EXIT STATUS"
@@ -86,6 +105,10 @@ Successful program execution.
 .TP
 .BR 1 " (EXIT_FAILURE)"
 The operation failed or the command syntax was not valid.
+.TP
+.BR 70 " (EX_SOFTWARE)"
+libopts had an internal operational error.  Please report
+it to autogen-users@lists.sourceforge.net.  Thank you.
 .SH AUTHORS
 .An "Harlan Stenn"
 .SH "COPYRIGHT"
@@ -94,7 +117,6 @@ This program is released under the terms of the NTP license, \fP or \fBNTP_WAIT\fP
+  \fBNTP_WAIT_\fP or \fBNTP_WAIT\fP
 .fi
 .ad
+cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option\-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation\-notes environment files examples exit\-status errors
+        compatibility see\-also conforming\-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end\-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end\-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .Sh "EXIT STATUS"
@@ -84,16 +103,18 @@ One of the following exit values will be returned:
 Successful program execution.
 .It 1 " (EXIT_FAILURE)"
 The operation failed or the command syntax was not valid.
+.It 70 " (EX_SOFTWARE)"
+libopts had an internal operational error.  Please report
+it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh AUTHORS
 .An "Harlan Stenn"
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2013 The University of Delaware all rights reserved.
+Copyright (C) 1970\-2013 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-This document corresponds to version @VERSION@ of NTP.
-.Pp
-This manual page was \fIAutoGen\fP-erated from the \fBntp-wait\fP
+This document corresponds to version 4.2.7p345 of NTP..Pp
+This manual page was \fIAutoGen\fP\-erated from the \fBntp\-wait\fP
 option definitions.
diff --git a/sntp/invoke-sntp.texi b/sntp/invoke-sntp.texi
index dc492e0f2..a1de37b13 100644
--- a/sntp/invoke-sntp.texi
+++ b/sntp/invoke-sntp.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-sntp.texi)
 # 
-# It has been AutoGen-ed  January  3, 2013 at 01:11:33 PM by AutoGen 5.17.1pre11
+# It has been AutoGen-ed  January  4, 2013 at 09:05:18 AM by AutoGen 5.17.1pre11
 # From the definitions    sntp-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -101,7 +101,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p344
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p345
 USAGE:  sntp [ - [] | --[@{=| @}] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -396,8 +396,8 @@ The command line options relating to configuration and/or usage help are:
 
 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:
 
 @table @samp
 @item version
@@ -452,5 +452,5 @@ Harlan Stenn@*
 Dave Hart@*
 @node sntp Notes
 @subsection sntp Notes
-This document corresponds to version @VERSION@ of
+This document corresponds to version 4.2.7p345 of
 @code{sntp}.
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 8a652ef89..39a6f6e38 100644
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  January  3, 2013 at 01:02:56 PM by AutoGen 5.17.1pre11
+ *  It has been AutoGen-ed  January  4, 2013 at 08:57:36 AM by AutoGen 5.17.1pre11
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -73,7 +73,7 @@ extern FILE * option_usage_fp;
  *  sntp option static const strings
  */
 static char const sntp_opt_strs[2500] =
-/*     0 */ "sntp 4.2.7p344\n"
+/*     0 */ "sntp 4.2.7p345\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"
@@ -157,7 +157,7 @@ static char const sntp_opt_strs[2500] =
 /*  2244 */ "LOAD_OPTS\0"
 /*  2254 */ "no-load-opts\0"
 /*  2267 */ "SNTP\0"
-/*  2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p344\n"
+/*  2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p345\n"
             "USAGE:  %s [ - [] | --[{=| }] ]... \\\n"
             "\t\t[ hostname-or-IP ...]\n\0"
 /*  2433 */ "$HOME\0"
@@ -165,7 +165,7 @@ static char const sntp_opt_strs[2500] =
 /*  2441 */ ".ntprc\0"
 /*  2448 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2482 */ "\n\n\0"
-/*  2485 */ "sntp 4.2.7p344";
+/*  2485 */ "sntp 4.2.7p345";
 
 /*
  *  ipv4 option description with
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 2cf052e28..70c9b4b23 100644
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  January  3, 2013 at 01:02:55 PM by AutoGen 5.17.1pre11
+ *  It has been AutoGen-ed  January  4, 2013 at 08:57:36 AM by AutoGen 5.17.1pre11
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -90,8 +90,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    23
-#define SNTP_VERSION       "4.2.7p344"
-#define SNTP_FULL_VERSION  "sntp 4.2.7p344"
+#define SNTP_VERSION       "4.2.7p345"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p345"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index 47677a61c..0f326021f 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "03 Jan 2013" "4.2.7p344" "User Commands"
+.TH sntp 1sntpman "04 Jan 2013" "4.2.7p345" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:11:28 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:05:14 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -56,7 +56,7 @@ Finally, the
 of the host is reported.
 .SH "OPTIONS"
 .TP
-.BR \-4 ", " -\-ipv4
+.BR \-4 ", " \-\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
@@ -64,7 +64,7 @@ ipv6.
 Force DNS resolution of the following host names on the command line
 to the IPv4 namespace.
 .TP
-.BR \-6 ", " -\-ipv6
+.BR \-6 ", " \-\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
@@ -102,7 +102,7 @@ The \fB-c\fP or \fB--concurrent\fP flag says that any IPs
 returned for the DNS lookup of the supplied host-name are on
 different machines, so we can send concurrent queries.
 .TP
-.BR \-d ", " -\-debug\-level
+.BR \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
@@ -161,7 +161,7 @@ greater than or equal to 0
 .sp
 If the time adjustment is less than \fIsteplimit\fP milliseconds,
 slew the amount using \fBadjtime(2)\fP.  Otherwise, step the
-correction using \fBsettimeofday(2)\fP.
+correction using \fBsettimeofday(2)\fP. 
 .TP
 .BR \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
 Send \fBint\fP as our NTP protocol version.
@@ -180,17 +180,17 @@ The default \fInumber\fP for this option is:
 When sending requests to a remote server, tell them we are running
 NTP protocol version \fIntpversion\fP .
 .TP
-.BR \-r ", " -\-usereservedport
+.BR \-r ", " \-\-usereservedport
 Use the NTP Reserved Port (port 123).
 .sp
 Use port 123, which is reserved for NTP, for our network
 communications.
 .TP
-.BR \-S ", " -\-step
+.BR \-S ", " \-\-step
 OK to 'step' the time with \fBsettimeofday(2)\fP.
 .sp
 .TP
-.BR \-s ", " -\-slew
+.BR \-s ", " \-\-slew
 OK to 'slew' the time with \fBadjtime(2)\fP.
 .sp
 .TP
@@ -247,6 +247,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2man'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation-notes environment files examples exit-status errors
+        compatibility see-also conforming-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH USAGE
 .TP
 .BR Li "sntp ntpserver.somewhere"
@@ -254,13 +273,13 @@ is the simplest use of this program
 and can be run as an unprivileged command
 to check the current time and error in the local clock.
 .TP
-.BR Li "sntp -a ntpserver.somewhere"
+.BR Li "sntp \-a ntpserver.somewhere"
 With suitable privilege,
 run as a command
 or from a
 .Xr cron 8
 job,
-.Ic "sntp -a"
+.Ic "sntp \-a"
 will reset the local clock from a synchronized specified server,
 like the (deprecated)
 .Xr ntpdate 1ntpdatemdoc ,
@@ -296,8 +315,7 @@ This program is released under the terms of the NTP license,  " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
 Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
 Load options from \fIrcfile\fP.
-The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+The \fIno\-load\-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
 .It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 Output version of program and exit.  The default mode is `v', a simple
@@ -227,7 +222,7 @@ Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  \fBSNTP_\fP or \fBSNTP\fP
+  \fBSNTP_\fP or \fBSNTP\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
@@ -235,19 +230,38 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option\-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation\-notes environment files examples exit\-status errors
+        compatibility see\-also conforming\-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end\-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end\-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh USAGE
 .Bl -tag -width indent
 .It Li "sntp ntpserver.somewhere"
 is the simplest use of this program
 and can be run as an unprivileged command
 to check the current time and error in the local clock.
-.It Li "sntp -a ntpserver.somewhere"
+.It Li "sntp \-a ntpserver.somewhere"
 With suitable privilege,
 run as a command
 or from a
 .Xr cron 8
 job,
-.Ic "sntp -a"
+.Ic "sntp \-a"
 will reset the local clock from a synchronized specified server,
 like the (deprecated)
 .Xr ntpdate 1ntpdatemdoc ,
@@ -270,20 +284,19 @@ The operation failed or the command syntax was not valid.
 A specified configuration file could not be loaded.
 .It 70 " (EX_SOFTWARE)"
 libopts had an internal operational error.  Please report
-it to autogen-users@lists.sourceforge.net.  Thank you.
+it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh AUTHORS
 .An "Johannes Maximilian Kuehn"
 .An "Harlan Stenn"
 .An "Dave Hart"
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2013 The University of Delaware all rights reserved.
+Copyright (C) 1970\-2013 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-This document corresponds to version @VERSION@ of
-.Nm .
-.Pp
-This manual page was \fIAutoGen\fP-erated from the \fBsntp\fP
+This document corresponds to version 4.2.7p345 of
+.Nm ..Pp
+This manual page was \fIAutoGen\fP\-erated from the \fBsntp\fP
 option definitions.
diff --git a/sntp/sntp.html b/sntp/sntp.html
index 7ea0d1664..505c286d0 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -36,7 +36,7 @@ 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.7p344 of sntp.
+  
          This document applies to version 4.2.7p345 of sntp.
 
   
          The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -176,7 +176,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.
 
-
          sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p344
+
          sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p345
 USAGE:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -551,8 +551,8 @@ the associated name/value pair list (see: optionFindValue).
 
 
          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. 
@@ -627,7 +627,7 @@ Up: sntp Invocation
 
 
          sntp Notes
          
 
-
          This document corresponds to version  of
+
          This document corresponds to version 4.2.7p345 of
 sntp.
 
 
          
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index c11c8d0da..2b4cdad0d 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "03 Jan 2013" "4.2.7p344" "User Commands"
+.TH sntp @SNTP_MS@ "04 Jan 2013" "4.2.7p345" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:11:28 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:05:14 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -56,7 +56,7 @@ Finally, the
 of the host is reported.
 .SH "OPTIONS"
 .TP
-.BR \-4 ", " -\-ipv4
+.BR \-4 ", " \-\-ipv4
 Force IPv4 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv6.
@@ -64,7 +64,7 @@ ipv6.
 Force DNS resolution of the following host names on the command line
 to the IPv4 namespace.
 .TP
-.BR \-6 ", " -\-ipv6
+.BR \-6 ", " \-\-ipv6
 Force IPv6 DNS name resolution.
 This option must not appear in combination with any of the following options:
 ipv4.
@@ -102,7 +102,7 @@ The \fB-c\fP or \fB--concurrent\fP flag says that any IPs
 returned for the DNS lookup of the supplied host-name are on
 different machines, so we can send concurrent queries.
 .TP
-.BR \-d ", " -\-debug\-level
+.BR \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
@@ -161,7 +161,7 @@ greater than or equal to 0
 .sp
 If the time adjustment is less than \fIsteplimit\fP milliseconds,
 slew the amount using \fBadjtime(2)\fP.  Otherwise, step the
-correction using \fBsettimeofday(2)\fP.
+correction using \fBsettimeofday(2)\fP. 
 .TP
 .BR \-o " \fInumber\fP, " \-\-ntpversion "=" \fInumber\fP
 Send \fBint\fP as our NTP protocol version.
@@ -180,17 +180,17 @@ The default \fInumber\fP for this option is:
 When sending requests to a remote server, tell them we are running
 NTP protocol version \fIntpversion\fP .
 .TP
-.BR \-r ", " -\-usereservedport
+.BR \-r ", " \-\-usereservedport
 Use the NTP Reserved Port (port 123).
 .sp
 Use port 123, which is reserved for NTP, for our network
 communications.
 .TP
-.BR \-S ", " -\-step
+.BR \-S ", " \-\-step
 OK to 'step' the time with \fBsettimeofday(2)\fP.
 .sp
 .TP
-.BR \-s ", " -\-slew
+.BR \-s ", " \-\-slew
 OK to 'slew' the time with \fBadjtime(2)\fP.
 .sp
 .TP
@@ -247,6 +247,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2man'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation-notes environment files examples exit-status errors
+        compatibility see-also conforming-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH USAGE
 .TP
 .BR Li "sntp ntpserver.somewhere"
@@ -254,13 +273,13 @@ is the simplest use of this program
 and can be run as an unprivileged command
 to check the current time and error in the local clock.
 .TP
-.BR Li "sntp -a ntpserver.somewhere"
+.BR Li "sntp \-a ntpserver.somewhere"
 With suitable privilege,
 run as a command
 or from a
 .Xr cron 8
 job,
-.Ic "sntp -a"
+.Ic "sntp \-a"
 will reset the local clock from a synchronized specified server,
 like the (deprecated)
 .Xr ntpdate @NTPDATE_MS@ ,
@@ -296,8 +315,7 @@ This program is released under the terms of the NTP license,  " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
 Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
 Load options from \fIrcfile\fP.
-The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+The \fIno\-load\-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
 .It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 Output version of program and exit.  The default mode is `v', a simple
@@ -227,7 +222,7 @@ Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  \fBSNTP_\fP or \fBSNTP\fP
+  \fBSNTP_\fP or \fBSNTP\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
@@ -235,19 +230,38 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option\-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation\-notes environment files examples exit\-status errors
+        compatibility see\-also conforming\-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end\-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end\-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh USAGE
 .Bl -tag -width indent
 .It Li "sntp ntpserver.somewhere"
 is the simplest use of this program
 and can be run as an unprivileged command
 to check the current time and error in the local clock.
-.It Li "sntp -a ntpserver.somewhere"
+.It Li "sntp \-a ntpserver.somewhere"
 With suitable privilege,
 run as a command
 or from a
 .Xr cron 8
 job,
-.Ic "sntp -a"
+.Ic "sntp \-a"
 will reset the local clock from a synchronized specified server,
 like the (deprecated)
 .Xr ntpdate @NTPDATE_MS@ ,
@@ -270,20 +284,19 @@ The operation failed or the command syntax was not valid.
 A specified configuration file could not be loaded.
 .It 70 " (EX_SOFTWARE)"
 libopts had an internal operational error.  Please report
-it to autogen-users@lists.sourceforge.net.  Thank you.
+it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh AUTHORS
 .An "Johannes Maximilian Kuehn"
 .An "Harlan Stenn"
 .An "Dave Hart"
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2013 The University of Delaware all rights reserved.
+Copyright (C) 1970\-2013 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-This document corresponds to version @VERSION@ of
-.Nm .
-.Pp
-This manual page was \fIAutoGen\fP-erated from the \fBsntp\fP
+This document corresponds to version 4.2.7p345 of
+.Nm ..Pp
+This manual page was \fIAutoGen\fP\-erated from the \fBsntp\fP
 option definitions.
diff --git a/util/invoke-ntp-keygen.texi b/util/invoke-ntp-keygen.texi
index 625f8552a..e79d95809 100644
--- a/util/invoke-ntp-keygen.texi
+++ b/util/invoke-ntp-keygen.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-keygen.texi)
 # 
-# It has been AutoGen-ed  January  3, 2013 at 01:11:09 PM by AutoGen 5.17.1pre11
+# It has been AutoGen-ed  January  4, 2013 at 09:04:41 AM by AutoGen 5.17.1pre11
 # From the definitions    ntp-keygen-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -908,7 +908,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p344
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p345
 USAGE:  ntp-keygen [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
@@ -1336,8 +1336,8 @@ The command line options relating to configuration and/or usage help are:
 
 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:
 
 @table @samp
 @item version
@@ -1379,7 +1379,7 @@ no write password is specified, the read password is used
 as the write password by default.
 @node ntp-keygen Notes
 @subsection ntp-keygen Notes
-This document corresponds to version @VERSION@ of NTP.
+This document corresponds to version 4.2.7p345 of NTP.
 Portions of this document came from FreeBSD.
 @node ntp-keygen Bugs
 @subsection ntp-keygen Bugs
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 79f9f2272..a8be504c5 100644
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  January  3, 2013 at 01:10:51 PM by AutoGen 5.17.1pre11
+ *  It has been AutoGen-ed  January  4, 2013 at 09:04:25 AM by AutoGen 5.17.1pre11
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -75,7 +75,7 @@ extern FILE * option_usage_fp;
  *  ntp-keygen option static const strings
  */
 static char const ntp_keygen_opt_strs[2358] =
-/*     0 */ "ntp-keygen (ntp) 4.2.7p344\n"
+/*     0 */ "ntp-keygen (ntp) 4.2.7p345\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"
@@ -166,14 +166,14 @@ static char const ntp_keygen_opt_strs[2358] =
 /*  2136 */ "no-load-opts\0"
 /*  2149 */ "no\0"
 /*  2152 */ "NTP_KEYGEN\0"
-/*  2163 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p344\n"
+/*  2163 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p345\n"
             "USAGE:  %s [ - [] | --[{=| }] ]...\n\0"
 /*  2279 */ "$HOME\0"
 /*  2285 */ ".\0"
 /*  2287 */ ".ntprc\0"
 /*  2294 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2328 */ "\n\n\0"
-/*  2331 */ "ntp-keygen (ntp) 4.2.7p344";
+/*  2331 */ "ntp-keygen (ntp) 4.2.7p345";
 
 /*
  *  imbits option description:
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 24035722c..62710652b 100644
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  January  3, 2013 at 01:10:51 PM by AutoGen 5.17.1pre11
+ *  It has been AutoGen-ed  January  4, 2013 at 09:04:25 AM by AutoGen 5.17.1pre11
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -93,8 +93,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    26
-#define NTP_KEYGEN_VERSION       "4.2.7p344"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p344"
+#define NTP_KEYGEN_VERSION       "4.2.7p345"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p345"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman
index c115c0904..b94631ef4 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "03 Jan 2013" "ntp (4.2.7p344)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "04 Jan 2013" "ntp (4.2.7p345)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:11:02 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:04:36 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -881,7 +881,7 @@ private keys.  The default is three-key triple DES in CBC mode,
 equivalent to "@code{-C des-ede3-cbc".  The openssl tool lists ciphers
 available in "\fBopenssl \-h\fP" output.
 .TP
-.BR \-d ", " -\-debug\-level
+.BR \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
@@ -892,24 +892,24 @@ This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
 .TP
-.BR \-e ", " -\-id\-key
+.BR \-e ", " \-\-id\-key
 Write IFF or GQ identity keys.
 .sp
 Write the IFF or GQ client keys to the standard output.  This is
 intended for automatic key distribution by mail.
 .TP
-.BR \-G ", " -\-gq\-params
+.BR \-G ", " \-\-gq\-params
 Generate GQ parameters and keys.
 .sp
 Generate parameters and keys for the GQ identification scheme,
 obsoleting any that may exist.
 .TP
-.BR \-H ", " -\-host\-key
+.BR \-H ", " \-\-host\-key
 generate RSA host key.
 .sp
 Generate new host keys, obsoleting any that may exist.
 .TP
-.BR \-I ", " -\-iffkey
+.BR \-I ", " \-\-iffkey
 generate IFF parameters.
 .sp
 Generate parameters for the IFF identification scheme, obsoleting
@@ -926,7 +926,7 @@ using \fB-s/--subject-name\fP following an '\fB@\fP' character,
 is also a part of the self-signed host certificate's subject and
 issuer names in the form \fBhost@group\fP and should match the
 '\fBcrypto ident\fP' or '\fBserver ident\fP' configuration in
-\fBntpd\fP's configuration file.
+\fBntpd\fP's configuration file. 
 .TP
 .BR \-l " \fIlifetime\fP, " \-\-lifetime "=" \fIlifetime\fP
 set certificate lifetime.
@@ -934,7 +934,7 @@ This option takes an integer number as its argument.
 .sp
 Set the certificate expiration to lifetime days from now.
 .TP
-.BR \-M ", " -\-md5key
+.BR \-M ", " \-\-md5key
 generate MD5 keys.
 .sp
 Generate MD5 keys, obsoleting any that may exist.
@@ -952,7 +952,7 @@ in the range  256 through 2048
 .sp
 The number of bits in the prime modulus.  The default is 512.
 .TP
-.BR \-P ", " -\-pvt\-cert
+.BR \-P ", " \-\-pvt\-cert
 generate PC private certificate.
 .sp
 Generate a private certificate.  By default, the program generates
@@ -990,7 +990,7 @@ subject and issuer fields, as with \fB-i group\fP.  The group name, or
 if not provided, the host name are also used in the file names
 of IFF, GQ, and MV client parameter files.
 .TP
-.BR \-T ", " -\-trusted\-cert
+.BR \-T ", " \-\-trusted\-cert
 trusted certificate (TC scheme).
 .sp
 Generate a trusted certificate.  By default, the program generates
@@ -1042,6 +1042,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2man'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation-notes environment files examples exit-status errors
+        compatibility see-also conforming-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .SH USAGE
 The
 p Ar password
@@ -1087,8 +1106,7 @@ with older architectures such as SPARC IPC.
 .PP
 Please report bugs to http://bugs.ntp.org .Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH NOTES
-This document corresponds to version @VERSION@ of NTP.
-Portions of this document came from FreeBSD.
-.PP
+This document corresponds to version 4.2.7p345 of NTP.
+Portions of this document came from FreeBSD..Pp
 This manual page was \fIAutoGen\fP-erated from the \fBntp-keygen\fP
 option definitions.
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index 8318f3876..1762f102a 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd January 3 2013
+.Dd January 4 2013
 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January  3, 2013 at 01:11:11 PM by AutoGen 5.17.1pre11
+.\"  It has been AutoGen-ed  January  4, 2013 at 09:04:43 AM by AutoGen 5.17.1pre11
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -14,7 +14,7 @@
 .\" Mixture of short (flag) options and long options
 .Op Fl flags
 .Op Fl flag Ar value
-.Op Fl \-option-name Ar value
+.Op Fl \-option\-name Ar value
 .Pp
 All arguments must be options.
 .Pp
@@ -29,16 +29,16 @@ These files are used for cookie encryption,
 digital signature and challenge/response identification algorithms
 compatible with the Internet standard security infrastructure.
 .Pp
-All files are in PEM-encoded printable ASCII format,
+All files are in PEM\-encoded printable ASCII format,
 so they can be embedded as MIME attachments in mail to other sites
 and certificate authorities.
 By default, files are not encrypted.
 .Pp
 When used to generate message digest keys, the program produces a file
-containing ten pseudo-random printable ASCII strings suitable for the
+containing ten pseudo\-random printable ASCII strings suitable for the
 MD5 message digest algorithm included in the distribution.
 If the OpenSSL library is installed, it produces an additional ten
-hex-encoded random bit strings suitable for the SHA1 and other message
+hex\-encoded random bit strings suitable for the SHA1 and other message
 digest algorithms.
 The message digest keys file must be distributed and stored
 using secure means beyond the scope of NTP itself.
@@ -90,7 +90,7 @@ is usually installed in
 Other files and links are usually installed in
 .Pa /usr/local/etc ,
 which is normally in a shared filesystem in
-NFS-mounted networks and cannot be changed by shared clients.
+NFS\-mounted networks and cannot be changed by shared clients.
 The location of the keys directory can be changed by the
 .Ar keysdir
 configuration command in such cases.
@@ -119,7 +119,7 @@ When run for the first time, or if all files with names beginning with
 have been removed, use the
 .Nm
 command without arguments to generate a
-default RSA host key and matching RSA-MD5 certificate with expiration
+default RSA host key and matching RSA\-MD5 certificate with expiration
 date one year hence.
 If run again without options, the program uses the
 existing keys and parameters and generates only a new certificate with
@@ -154,16 +154,16 @@ option.
 The rules say cryptographic media should be generated with proventic
 filestamps, which means the host should already be synchronized before
 this program is run.
-This of course creates a chicken-and-egg problem
+This of course creates a chicken\-and\-egg problem
 when the host is started for the first time.
 Accordingly, the host time
-should be set by some other means, such as eyeball-and-wristwatch, at
+should be set by some other means, such as eyeball\-and\-wristwatch, at
 least so that the certificate lifetime is within the current year.
 After that and when the host is synchronized to a proventic source, the
-certificate should be re-generated.
+certificate should be re\-generated.
 .Pp
 Additional information on trusted groups and identity schemes is on the
-.Dq Autokey Public-Key Authentication
+.Dq Autokey Public\-Key Authentication
 page.
 .Pp
 The
@@ -205,7 +205,7 @@ and generation date and time as comments.
 All files are installed by default in the keys directory
 .Pa /usr/local/etc ,
 which is normally in a shared filesystem
-in NFS-mounted networks.
+in NFS\-mounted networks.
 The actual location of the keys directory
 and each file can be overridden by configuration commands,
 but this is not recommended.
@@ -215,7 +215,7 @@ as noted later on this page.
 .Pp
 Normally, files containing private values,
 including the host key, sign key and identification parameters,
-are permitted root read/write-only;
+are permitted root read/write\-only;
 while others containing public values are permitted world readable.
 Alternatively, files containing private values can be encrypted
 and these files permitted world readable,
@@ -254,7 +254,7 @@ When run for the first time,
 or if all
 .Cm ntpkey
 files have been removed,
-the program generates a RSA host key file and matching RSA-MD5 certificate file,
+the program generates a RSA host key file and matching RSA\-MD5 certificate file,
 which is all that is necessary in many cases.
 The program also generates soft links from the generic names
 to the respective files.
@@ -297,7 +297,7 @@ in the root directory, so it is convenient to define the
 environment variable used by the OpenSSL library as the path to
 .Cm /.rnd .
 .Pp
-Installing the keys as root might not work in NFS-mounted
+Installing the keys as root might not work in NFS\-mounted
 shared file systems, as NFS clients may not be able to write
 to the shared keys directory, even as root.
 In this case, NFS clients can specify the files in another
@@ -323,7 +323,7 @@ while the trusted name is used for the identity files.
 All files are installed by default in the keys directory
 .Pa /usr/local/etc ,
 which is normally in a shared filesystem
-in NFS-mounted networks.
+in NFS\-mounted networks.
 The actual location of the keys directory
 and each file can be overridden by configuration commands,
 but this is not recommended.
@@ -333,7 +333,7 @@ as noted later on this page.
 .Pp
 Normally, files containing private values,
 including the host key, sign key and identification parameters,
-are permitted root read/write-only;
+are permitted root read/write\-only;
 while others containing public values are permitted world readable.
 Alternatively, files containing private values can be encrypted
 and these files permitted world readable,
@@ -372,7 +372,7 @@ When run for the first time,
 or if all
 .Cm ntpkey
 files have been removed,
-the program generates a RSA host key file and matching RSA-MD5 certificate file,
+the program generates a RSA host key file and matching RSA\-MD5 certificate file,
 which is all that is necessary in many cases.
 The program also generates soft links from the generic names
 to the respective files.
@@ -415,7 +415,7 @@ in the root directory, so it is convenient to define the
 environment variable used by the OpenSSL library as the path to
 .Cm /.rnd .
 .Pp
-Installing the keys as root might not work in NFS-mounted
+Installing the keys as root might not work in NFS\-mounted
 shared file systems, as NFS clients may not be able to write
 to the shared keys directory, even as root.
 In this case, NFS clients can specify the files in another
@@ -448,7 +448,7 @@ section of
 .Xr ntp.conf 5 .
 The default cryptotype uses RSA encryption, MD5 message digest
 and TC identification.
-First, configure a NTP subnet including one or more low-stratum
+First, configure a NTP subnet including one or more low\-stratum
 trusted hosts from which all other hosts derive synchronization
 directly or indirectly.
 Trusted hosts have trusted certificates;
@@ -490,7 +490,7 @@ is either
 .Cm RSA
 or
 .Cm DSA .
-The most often need to do this is when a DSA-signed certificate is used.
+The most often need to do this is when a DSA\-signed certificate is used.
 If it is necessary to use a different certificate scheme than the default,
 run
 .Nm
@@ -553,7 +553,7 @@ On trusted host alice run
 to generate the host key file
 .Pa ntpkey_RSAkey_ Ns Ar alice.filestamp
 and trusted private certificate file
-.Pa ntpkey_RSA-MD5_cert_ Ns Ar alice.filestamp .
+.Pa ntpkey_RSA\-MD5_cert_ Ns Ar alice.filestamp .
 Copy both files to all group hosts;
 they replace the files which would be generated in other schemes.
 On each host bob install a soft link from the generic name
@@ -666,16 +666,16 @@ Select certificate message digest/signature encryption scheme.
 The
 .Ar scheme
 can be one of the following:
-. Cm RSA-MD2 , RSA-MD5 , RSA-SHA , RSA-SHA1 , RSA-MDC2 , RSA-RIPEMD160 , DSA-SHA ,
+. Cm RSA\-MD2 , RSA\-MD5 , RSA\-SHA , RSA\-SHA1 , RSA\-MDC2 , RSA\-RIPEMD160 , DSA\-SHA ,
 or
-.Cm DSA-SHA1 .
+.Cm DSA\-SHA1 .
 Note that RSA schemes must be used with a RSA sign key and DSA
 schemes must be used with a DSA sign key.
 The default without this option is
-.Cm RSA-MD5 .
+.Cm RSA\-MD5 .
 .It Fl d
 Enable debugging.
-This option displays the cryptographic data produced in eye-friendly billboards.
+This option displays the cryptographic data produced in eye\-friendly billboards.
 .It Fl e
 Write the IFF client keys to the standard output.
 This is intended for automatic key distribution by mail.
@@ -704,7 +704,7 @@ By default, the program generates public certificates.
 .It Fl p Ar password
 Encrypt generated files containing private data with
 .Ar password
-and the DES-CBC algorithm.
+and the DES\-CBC algorithm.
 .It Fl q
 Set the password for reading files to password.
 .It Fl S Oo Cm RSA | DSA Oc
@@ -718,14 +718,14 @@ This is used for the issuer field in certificates
 and in the file name for identity files.
 .It Fl T
 Generate a trusted certificate.
-By default, the program generates a non-trusted certificate.
+By default, the program generates a non\-trusted certificate.
 .It Fl V Ar nkeys
-Generate parameters and keys for the Mu-Varadharajan (MV) identification scheme.
+Generate parameters and keys for the Mu\-Varadharajan (MV) identification scheme.
 .El
 .Ss Random Seed File
 All cryptographically sound key generation schemes must have means
 to randomize the entropy seed used to initialize
-the internal pseudo-random number generator used
+the internal pseudo\-random number generator used
 by the library routines.
 The OpenSSL library uses a designated random seed file for this purpose.
 The file must be available when starting the NTP daemon and
@@ -738,7 +738,7 @@ It is important to understand that entropy must be evolved
 for each generation, for otherwise the random number sequence
 would be predictable.
 Various means dependent on external events, such as keystroke intervals,
-can be used to do this and some systems have built-in entropy sources.
+can be used to do this and some systems have built\-in entropy sources.
 Suitable means are described in the OpenSSL software documentation,
 but are outside the scope of this page.
 .Pp
@@ -783,19 +783,19 @@ program and
 .Xr ntpd 1ntpdmdoc
 daemon.
 Cryptographic values are encoded first using ASN.1 rules,
-then encrypted if necessary, and finally written PEM-encoded
+then encrypted if necessary, and finally written PEM\-encoded
 printable ASCII format preceded and followed by MIME content identifier lines.
 .Pp
 The format of the symmetric keys file is somewhat different
 than the other files in the interest of backward compatibility.
-Since DES-CBC is deprecated in NTPv4, the only key format of interest
+Since DES\-CBC is deprecated in NTPv4, the only key format of interest
 is MD5 alphanumeric strings.
 Following hte heard the keys are
 entered one per line in the format
 .D1 Ar keyno type key
 where
 .Ar keyno
-is a positive integer in the range 1-65,535,
+is a positive integer in the range 1\-65,535,
 .Ar type
 is the string MD5 defining the key format and
 .Ar key
@@ -856,7 +856,6 @@ certificate scheme.
 scheme is one of
 RSA\-MD2, RSA\-MD5, RSA\-SHA, RSA\-SHA1, RSA\-MDC2, RSA\-RIPEMD160,
 DSA\-SHA, or DSA\-SHA1.
-.sp
 Select the certificate message digest/signature encryption scheme.
 Note that RSA schemes must be used with a RSA sign key and DSA
 schemes must be used with a DSA sign key.  The default without
@@ -868,32 +867,30 @@ Select the cipher which is used to encrypt the files containing
 private keys.  The default is three\-key triple DES in CBC mode,
 equivalent to "@code{\-C des\-ede3\-cbc".  The openssl tool lists ciphers
 available in "\fBopenssl \-h\fP" output.
-.It  \-d ", " -\-debug\-level
+.It  \-d ", " \-\-debug\-level
 Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-.sp
 .It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
 This option takes an integer number as its argument.
 .sp
-.sp
-.It  \-e ", " -\-id\-key
+.It  \-e ", " \-\-id\-key
 Write IFF or GQ identity keys.
 .sp
 Write the IFF or GQ client keys to the standard output.  This is
 intended for automatic key distribution by mail.
-.It  \-G ", " -\-gq\-params
+.It  \-G ", " \-\-gq\-params
 Generate GQ parameters and keys.
 .sp
 Generate parameters and keys for the GQ identification scheme,
 obsoleting any that may exist.
-.It  \-H ", " -\-host\-key
+.It  \-H ", " \-\-host\-key
 generate RSA host key.
 .sp
 Generate new host keys, obsoleting any that may exist.
-.It  \-I ", " -\-iffkey
+.It  \-I ", " \-\-iffkey
 generate IFF parameters.
 .sp
 Generate parameters for the IFF identification scheme, obsoleting
@@ -909,13 +906,13 @@ using \fB\-s/\-\-subject\-name\fP following an '\fB@\fP' character,
 is also a part of the self\-signed host certificate's subject and
 issuer names in the form \fBhost@group\fP and should match the
 \'\fBcrypto ident\fP' or '\fBserver ident\fP' configuration in
-\fBntpd\fP's configuration file.
+\fBntpd\fP's configuration file. 
 .It  \-l " \fIlifetime\fP, " \-\-lifetime "=" \fIlifetime\fP
 set certificate lifetime.
 This option takes an integer number as its argument.
 .sp
 Set the certificate expiration to lifetime days from now.
-.It  \-M ", " -\-md5key
+.It  \-M ", " \-\-md5key
 generate MD5 keys.
 .sp
 Generate MD5 keys, obsoleting any that may exist.
@@ -931,7 +928,7 @@ in the range  256 through 2048
 .in -4
 .sp
 The number of bits in the prime modulus.  The default is 512.
-.It  \-P ", " -\-pvt\-cert
+.It  \-P ", " \-\-pvt\-cert
 generate PC private certificate.
 .sp
 Generate a private certificate.  By default, the program generates
@@ -964,7 +961,7 @@ leaving the host name unchanged while appending \fB@group\fP to the
 subject and issuer fields, as with \fB\-i group\fP.  The group name, or
 if not provided, the host name are also used in the file names
 of IFF, GQ, and MV client parameter files.
-.It  \-T ", " -\-trusted\-cert
+.It  \-T ", " \-\-trusted\-cert
 trusted certificate (TC scheme).
 .sp
 Generate a trusted certificate.  By default, the program generates
@@ -982,15 +979,15 @@ This option takes an integer number as its argument.
 This option has not been fully documented.
 .It \-? , " \-\-help"
 Display usage information and exit.
-.It \-! , " \-\-more-help"
+.It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
+.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
 Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
+.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
 Load options from \fIrcfile\fP.
-The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+The \fIno\-load\-opts\fP form will disable the loading
+of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
 .It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
 Output version of program and exit.  The default mode is `v', a simple
@@ -1002,7 +999,7 @@ Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from
 environment variables named:
 .nf
-  \fBNTP_KEYGEN_\fP or \fBNTP_KEYGEN\fP
+  \fBNTP_KEYGEN_\fP or \fBNTP_KEYGEN\fP
 .fi
 .ad
 The environmental presets take precedence (are processed later than)
@@ -1010,6 +1007,25 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
+cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc'
+cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd
+         `/`basename "$cvt_prog"`
+cd $tmp_dir
+test \-x "$cvt_prog" || die "'$cvt_prog' is not executable"
+{
+    list='synopsis description options option\-presets'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list name
+    list='implementation\-notes environment files examples exit\-status errors
+        compatibility see\-also conforming\-to history authors copyright bugs
+        notes'
+    for f in $list ; do cat $f ; echo ; done > .end\-doc
+    rm \-f $list
+    list=`ls \-1 *`' .end\-doc'
+    for f in $list ; do cat $f ; echo ; done
+    rm \-f $list
+} 1>.doc 2>/dev/null
+sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ 	]*$' | $cvt_prog
 .Sh USAGE
 The
 .Fl p Ar password
@@ -1038,12 +1054,12 @@ The operation failed or the command syntax was not valid.
 A specified configuration file could not be loaded.
 .It 70 " (EX_SOFTWARE)"
 libopts had an internal operational error.  Please report
-it to autogen-users@lists.sourceforge.net.  Thank you.
+it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh "AUTHORS"
 The University of Delaware
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2013 The University of Delaware all rights reserved.
+Copyright (C) 1970\-2013 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh BUGS
 It can take quite a while to generate some cryptographic values,
@@ -1053,8 +1069,7 @@ with older architectures such as SPARC IPC.
 .Pp
 Please report bugs to http://bugs.ntp.org .Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
-This document corresponds to version @VERSION@ of NTP.
-Portions of this document came from FreeBSD.
-.Pp
-This manual page was \fIAutoGen\fP-erated from the \fBntp-keygen\fP
+This document corresponds to version 4.2.7p345 of NTP.
+Portions of this document came from FreeBSD..Pp
+This manual page was \fIAutoGen\fP\-erated from the \fBntp\-keygen\fP
 option definitions.
diff --git a/util/ntp-keygen.html b/util/ntp-keygen.html
index b305b1d3e..97b238e63 100644
--- a/util/ntp-keygen.html
+++ b/util/ntp-keygen.html
@@ -70,7 +70,7 @@ All other files are in PEM-encoded
 printable ASCII format so they can be embedded as MIME attachments in
 mail to other sites.
 
-  
          This document applies to version 4.2.7p344 of ntp-keygen.
+  
          This document applies to version 4.2.7p345 of ntp-keygen.
 
 
          
 
          
@@ -255,63 +255,71 @@ other than Autokey.
 
   
          Some files used by this program are encrypted using a private password. 
 The
--p option specifies the password for local encrypted files and the
--q option the password for encrypted files sent to remote sites. 
+-p
+option specifies the password for local encrypted files and the
+-q
+option the password for encrypted files sent to remote sites. 
 If no password is specified, the host name returned by the Unix
 gethostname()
 function, normally the DNS name of the host is used.
 
   
          The
-pw option of the
-crypto configuration command specifies the read
+pw
+option of the
+crypto
+configuration command specifies the read
 password for previously encrypted local files. 
 This must match the local password used by this program. 
 If not specified, the host name is used. 
 Thus, if files are generated by this program without password,
 they can be read back by
-ntpd without password but only on the same host.
+ntpd
+without password but only on the same host.
 
   
          Normally, encrypted files for each host are generated by that host and
 used only by that host, although exceptions exist as noted later on
 this page. 
 The symmetric keys file, normally called
-ntp.keys, is usually installed in
+ntp.keys,
+is usually installed in
 /etc. 
 Other files and links are usually installed in
 /usr/local/etc,
 which is normally in a shared filesystem in
 NFS-mounted networks and cannot be changed by shared clients. 
 The location of the keys directory can be changed by the
-keysdir configuration command in such cases. 
+keysdir
+configuration command in such cases. 
 Normally, this is in
 /etc.
 
   
          This program directs commentary and error messages to the standard
 error stream
-stderr and remote files to the standard output stream
-stdout where they can be piped to other applications or redirected to files. 
+stderr
+and remote files to the standard output stream
+stdout
+where they can be piped to other applications or redirected to files. 
 The names used for generated files and links all begin with the
 string
-ntpkey and include the file type, generating host and filestamp,
+ntpkey
+and include the file type, generating host and filestamp,
 as described in the
 Cryptographic Data Files
 section below. 
 
          
 
          
-
+
 
          
 
          
 
-
          Running
          
+
          Running the Program
          
 
-
          Running
-the
-Program
-To test and gain experience with Autokey concepts, log in as root and
+
          To test and gain experience with Autokey concepts, log in as root and
 change to the keys directory, usually
 /usr/local/etc
 When run for the first time, or if all files with names beginning with
-ntpkey have been removed, use the
+ntpkey
+have been removed, use the
 ntp-keygen
 command without arguments to generate a
 default RSA host key and matching RSA-MD5 certificate with expiration
@@ -324,7 +332,8 @@ new expiration date one year hence.
 Designate one of them as the trusted host (TH) using
 ntp-keygen
 with the
--T option and configure it to synchronize from reliable Internet servers. 
+-T
+option and configure it to synchronize from reliable Internet servers. 
 Then configure the other hosts to synchronize to the TH directly or
 indirectly. 
 A certificate trail is created when Autokey asks the immediately
@@ -337,12 +346,14 @@ RSA type.
 By default, the host key is also the sign key used to encrypt
 signatures. 
 A different sign key can be assigned using the
--S option and this can be either RSA or DSA type. 
+-S
+option and this can be either RSA or DSA type. 
 By default, the signature
 message digest type is MD5, but any combination of sign key type and
 message digest type supported by the OpenSSL library can be specified
 using the
--c option. 
+-c
+option. 
 The rules say cryptographic media should be generated with proventic
 filestamps, which means the host should already be synchronized before
 this program is run. 
@@ -361,7 +372,8 @@ page.
   
          The
 ntpd(1ntpdmdoc)
 configuration command
-crypto pw password specifies the read password for previously encrypted files. 
+crypto pw password
+specifies the read password for previously encrypted files. 
 The daemon expires on the spot if the password is missing
 or incorrect. 
 For convenience, if a file has been previously encrypted,
@@ -371,17 +383,24 @@ If the previous write password is specified as the host name,
 these files can be read by that host with no explicit password.
 
   
          File names begin with the prefix
-ntpkey_ and end with the postfix
-_hostname.filestamp, where
-hostname is the owner name, usually the string returned
+ntpkey_
+and end with the postfix
+_hostname.filestamp,
+where
+hostname
+is the owner name, usually the string returned
 by the Unix gethostname() routine, and
-filestamp is the NTP seconds when the file was generated, in decimal digits. 
+filestamp
+is the NTP seconds when the file was generated, in decimal digits. 
 This both guarantees uniqueness and simplifies maintenance
 procedures, since all files can be quickly removed
 by a
-rm ntpkey\&* command or all files generated
+rm ntpkey*
+command or all files generated
 at a specific time can be removed by a
-rm \&*filestamp command. 
+rm
+*filestamp
+command. 
 To further reduce the risk of misconfiguration,
 the first two lines of a file contain the file name
 and generation date and time as comments.
@@ -428,16 +447,13 @@ at one time, so each generation is distinct and can be readily
 recognized in monitoring data. 
 
          
 
          
-
+
 
          
 
          
 
-
          Running
          
+
          Running the program
          
 
-
          Running
-the
-program
-The safest way to run the
+
          The safest way to run the
 ntp-keygen
 program is logged in directly as root. 
 The recommended procedure is change to the keys directory,
@@ -446,7 +462,8 @@ usually
 then run the program. 
 When run for the first time,
 or if all
-ntpkey files have been removed,
+ntpkey
+files have been removed,
 the program generates a RSA host key file and matching RSA-MD5 certificate file,
 which is all that is necessary in many cases. 
 The program also generates soft links from the generic names
@@ -476,23 +493,29 @@ However, the identification parameter files, although encoded
 as the other files, are probably not compatible with anything other than Autokey.
 
   
          Running the program as other than root and using the Unix
-su command
+su
+command
 to assume root may not work properly, since by default the OpenSSL library
 looks for the random seed file
-.rnd in the user home directory. 
+.rnd
+in the user home directory. 
 However, there should be only one
-.rnd, most conveniently
+.rnd,
+most conveniently
 in the root directory, so it is convenient to define the
-$RANDFILE environment variable used by the OpenSSL library as the path to
-/.rnd. 
-Installing the keys as root might not work in NFS-mounted
+$RANDFILE
+environment variable used by the OpenSSL library as the path to
+/.rnd.
+
+  
          Installing the keys as root might not work in NFS-mounted
 shared file systems, as NFS clients may not be able to write
 to the shared keys directory, even as root. 
 In this case, NFS clients can specify the files in another
 directory such as
 /etc
 using the
-keysdir command. 
+keysdir
+command. 
 There is no need for one client to read the keys and certificates
 of other clients or servers, as these data are obtained automatically
 by the Autokey protocol.
@@ -549,16 +572,13 @@ at one time, so each generation is distinct and can be readily
 recognized in monitoring data. 
 
          
 
          
-
+
 
          
 
          
 
-
          Running
          
+
          Running the program
          
 
-
          Running
-the
-program
-The safest way to run the
+
          The safest way to run the
 ntp-keygen
 program is logged in directly as root. 
 The recommended procedure is change to the keys directory,
@@ -567,7 +587,8 @@ usually
 then run the program. 
 When run for the first time,
 or if all
-ntpkey files have been removed,
+ntpkey
+files have been removed,
 the program generates a RSA host key file and matching RSA-MD5 certificate file,
 which is all that is necessary in many cases. 
 The program also generates soft links from the generic names
@@ -597,23 +618,29 @@ However, the identification parameter files, although encoded
 as the other files, are probably not compatible with anything other than Autokey.
 
   
          Running the program as other than root and using the Unix
-su command
+su
+command
 to assume root may not work properly, since by default the OpenSSL library
 looks for the random seed file
-.rnd in the user home directory. 
+.rnd
+in the user home directory. 
 However, there should be only one
-.rnd, most conveniently
+.rnd,
+most conveniently
 in the root directory, so it is convenient to define the
-$RANDFILE environment variable used by the OpenSSL library as the path to
-/.rnd. 
-Installing the keys as root might not work in NFS-mounted
+$RANDFILE
+environment variable used by the OpenSSL library as the path to
+/.rnd.
+
+  
          Installing the keys as root might not work in NFS-mounted
 shared file systems, as NFS clients may not be able to write
 to the shared keys directory, even as root. 
 In this case, NFS clients can specify the files in another
 directory such as
 /etc
 using the
-keysdir command. 
+keysdir
+command. 
 There is no need for one client to read the keys and certificates
 of other clients or servers, as these data are obtained automatically
 by the Autokey protocol.
@@ -634,8 +661,7 @@ seconds.
 Each cryptographic configuration involves selection of a signature scheme
 and identification scheme, called a cryptotype,
 as explained in the
-AuthenticationAuthentication
-Options
+Authentication Options
 section of
 ntp.conf(5). 
 The default cryptotype uses RSA encryption, MD5 message digest
@@ -651,21 +677,21 @@ A trusted group is the set of all hosts that have, directly or indirectly,
 a certificate trail ending at a trusted host. 
 The trail is defined by static configuration file entries
 or dynamic means described on the
-AutomaticAutomatic
-NTP
-Configuration
-Options
+Automatic NTP Configuration Options
 section of
 ntp.conf(5).
 
   
          On each trusted host as root, change to the keys directory. 
 To insure a fresh fileset, remove all
-ntpkey files. 
+ntpkey
+files. 
 Then run
 ntp-keygen
--T to generate keys and a trusted certificate. 
+-T
+to generate keys and a trusted certificate. 
 On all other hosts do the same, but leave off the
--T flag to generate keys and nontrusted certificates. 
+-T
+flag to generate keys and nontrusted certificates. 
 When complete, start the NTP daemons beginning at the lowest stratum
 and working up the tree. 
 It may take some time for Autokey to instantiate the certificate trails
@@ -675,16 +701,22 @@ throughout the subnet, but setting up the environment is completely automatic.
 scheme than the default, run
 ntp-keygen
 with the
--S -type option, where
-type is either
-RSA or
-DSA. The most often need to do this is when a DSA-signed certificate is used. 
+-S -type
+option, where
+type
+is either
+RSA
+or
+DSA. 
+The most often need to do this is when a DSA-signed certificate is used. 
 If it is necessary to use a different certificate scheme than the default,
 run
 ntp-keygen
 with the
--c -scheme option and selected
-scheme as needed. 
+-c -scheme
+option and selected
+scheme
+as needed. 
 f
 ntp-keygen
 is run again without these options, it generates a new certificate
@@ -706,25 +738,20 @@ Other dependent hosts will continue as usual until signatures are refreshed,
 at which time the protocol is restarted. 
 
          
 
          
-
+
 
          
 
          
 
-
          Identity
          
+
          Identity Schemes
          
 
-
          Identity
-Schemes
-As mentioned on the Autonomous Authentication page,
+
          As mentioned on the Autonomous Authentication page,
 the default TC identity scheme is vulnerable to a middleman attack. 
 However, there are more secure identity schemes available,
 including PC, IFF, GQ and MV described on the
 "Identification Schemes"
 page
 (maybe available at
-.Li
-http://www.eecis.udel.edu/%7emills/keygen.html
-)
-. 
+http://www.eecis.udel.edu/%7emills/keygen.html). 
 These schemes are based on a TA, one or more trusted hosts
 and some number of nontrusted hosts. 
 Trusted hosts prove identity using values provided by the TA,
@@ -746,16 +773,18 @@ only as clients have key files that contain only client keys.
   
          The PC scheme supports only one trusted host in the group. 
 On trusted host alice run
 ntp-keygen
--P -p -password to generate the host key file
-ntpkey_RSAkey_NsAralice.filestamp
+-P
+-p -password
+to generate the host key file
+ntpkey_RSAkey_alice.filestamp
 and trusted private certificate file
-ntpkey_RSA-MD5_cert_NsAralice.filestamp. 
+ntpkey_RSA-MD5_cert_alice.filestamp. 
 Copy both files to all group hosts;
 they replace the files which would be generated in other schemes. 
 On each host bob install a soft link from the generic name
-ntpkey_host_NsArbob
+ntpkey_host_bob
 to the host key file and soft link
-ntpkey_cert_NsArbob
+ntpkey_cert_bob
 to the private certificate file. 
 Note the generic links are on bob, but point to files generated
 by trusted host alice. 
@@ -768,12 +797,15 @@ and certificates for all group hosts, then for every trusted host in the group,
 generate the IFF parameter file. 
 On trusted host alice run
 ntp-keygen
--T -I -p -password to produce her parameter file
-ntpkey_IFFpar_NsAralice.filestamp,
+-T
+-I
+-p -password
+to produce her parameter file
+ntpkey_IFFpar_alice.filestamp,
 which includes both server and client keys. 
 Copy this file to all group hosts that operate as both servers
 and clients and install a soft link from the generic
-ntpkey_iff_NsAralice
+ntpkey_iff_alice
 to this file. 
 If there are no hosts restricted to operate only as clients,
 there is nothing further to do. 
@@ -786,10 +818,11 @@ To eliminate this threat, the client keys can be extracted
 from the parameter file and distributed to all restricted clients. 
 After generating the parameter file, on alice run
 ntp-keygen
--e and pipe the output to a file or mail program. 
+-e
+and pipe the output to a file or mail program. 
 Copy or mail this file to all restricted clients. 
 On these clients install a soft link from the generic
-ntpkey_iff_NsAralice
+ntpkey_iff_alice
 to this file. 
 To further protect the integrity of the keys,
 each file can be encrypted with a secret password.
@@ -799,16 +832,19 @@ and certificates for all group hosts, then for every trusted host
 in the group, generate the IFF parameter file. 
 On trusted host alice run
 ntp-keygen
--T -G -p -password to produce her parameter file
-ntpkey_GQpar_NsAralice.filestamp,
+-T
+-G
+-p -password
+to produce her parameter file
+ntpkey_GQpar_alice.filestamp,
 which includes both server and client keys. 
 Copy this file to all group hosts and install a soft link
 from the generic
-ntpkey_gq_NsAralice
+ntpkey_gq_alice
 to this file. 
 In addition, on each host bob install a soft link
 from generic
-ntpkey_gq_NsArbob
+ntpkey_gq_bob
 to this file. 
 As the GQ scheme updates the GQ parameters file and certificate
 at the same time, keys and certificates can be regenerated as needed.
@@ -819,18 +855,24 @@ For illustration assume trish is the TA, alice one of several trusted hosts
 and bob one of her clients. 
 On TA trish run
 ntp-keygen
--V -n -p -password, where
-n is the number of revokable keys (typically 5) to produce
+-V -n
+-p -password,
+where
+n
+is the number of revokable keys (typically 5) to produce
 the parameter file
-ntpkeys_MVpar_NsArtrish.filestamp
+ntpkeys_MVpar_trish.filestamp
 and client key files
-ntpkeys_MVkeyd_NsArtrish.filestamp
+ntpkeys_MVkeyd_trish.filestamp
 where
-d is the key number (0 \&<
-d \&<
-n). Copy the parameter file to alice and install a soft link
+d
+is the key number (0 \&<
+d
+\&<
+n). 
+Copy the parameter file to alice and install a soft link
 from the generic
-ntpkey_mv_NsAralice
+ntpkey_mv_alice
 to this file. 
 Copy one of the client key files to alice for later distribution
 to her clients. 
@@ -838,88 +880,73 @@ It doesn't matter which client key file goes to alice,
 since they all work the same way. 
 Alice copies the client key file to all of her cliens. 
 On client bob install a soft link from generic
-ntpkey_mvkey_NsArbob
+ntpkey_mvkey_bob
 to the client key file. 
 As the MV scheme is independent of keys and certificates,
 these files can be refreshed as needed. 
 
          
 
          
-
+
 
          
 
          
 
-
          Command
          
+
          Command Line Options
          
 
-
          Command
-Line
-Options
      
          
-
          Fl
          Select certificate message digest/signature encryption scheme. 
+
          -c -scheme
          Select certificate message digest/signature encryption scheme. 
 The
-scheme can be one of the following:
-. 
-Cm
-RSA-MD2
-,
-RSA-MD5
-,
-RSA-SHA
-,
-RSA-SHA1
-,
-RSA-MDC2
-,
-RSA-RIPEMD160
-,
-DSA-SHA
-,
-or
-DSA-SHA1. Note that RSA schemes must be used with a RSA sign key and DSA
+scheme
+can be one of the following:
+
+     
          or
+DSA-SHA1. 
+Note that RSA schemes must be used with a RSA sign key and DSA
 schemes must be used with a DSA sign key. 
 The default without this option is
-RSA-MD5. 
          Fl
          Enable debugging. 
+RSA-MD5. 
+
          -d
          Enable debugging. 
 This option displays the cryptographic data produced in eye-friendly billboards. 
-
          Fl
          Write the IFF client keys to the standard output. 
+
          -e
          Write the IFF client keys to the standard output. 
 This is intended for automatic key distribution by mail. 
-
          Fl
          Generate parameters and keys for the GQ identification scheme,
+
          -G
          Generate parameters and keys for the GQ identification scheme,
 obsoleting any that may exist. 
-
          Fl
          Generate keys for the GQ identification scheme
+
          -g
          Generate keys for the GQ identification scheme
 using the existing GQ parameters. 
 If the GQ parameters do not yet exist, create them first. 
-
          Fl
          Generate new host keys, obsoleting any that may exist. 
-
          Fl
          Generate parameters for the IFF identification scheme,
+
          -H
          Generate new host keys, obsoleting any that may exist. 
+
          -I
          Generate parameters for the IFF identification scheme,
 obsoleting any that may exist. 
-
          Fl
          Set the suject name to
-name. This is used as the subject field in certificates
+
          -i -name
          Set the suject name to
+name. 
+This is used as the subject field in certificates
 and in the file name for host and sign keys. 
-
          Fl
          Generate MD5 keys, obsoleting any that may exist. 
-
          Fl
          Generate a private certificate. 
+
          -M
          Generate MD5 keys, obsoleting any that may exist. 
+
          -P
          Generate a private certificate. 
 By default, the program generates public certificates. 
-
          Fl
          Encrypt generated files containing private data with
-password and the DES-CBC algorithm. 
-
          Fl
          Set the password for reading files to password. 
-
          Fl
          Generate a new sign key of the designated type,
+
          -p -password
          Encrypt generated files containing private data with
+password
+and the DES-CBC algorithm. 
+
          -q
          Set the password for reading files to password. 
+
          -S -Oo -Cm -RSA - | -DSA -Oc
          Generate a new sign key of the designated type,
 obsoleting any that may exist. 
 By default, the program uses the host key as the sign key. 
-
          Fl
          Set the issuer name to
-name. This is used for the issuer field in certificates
+
          -s -name
          Set the issuer name to
+name. 
+This is used for the issuer field in certificates
 and in the file name for identity files. 
-
          Fl
          Generate a trusted certificate. 
+
          -T
          Generate a trusted certificate. 
 By default, the program generates a non-trusted certificate. 
-
          Fl
          Generate parameters and keys for the Mu-Varadharajan (MV) identification scheme. 
+
          -V -nkeys
          Generate parameters and keys for the Mu-Varadharajan (MV) identification scheme. 
 
          
-  
          
+
          
 
          
-
+
 
          
 
          
 
-
          Random
          
+
          Random Seed File
          
 
-
          Random
-Seed
-File
-All cryptographically sound key generation schemes must have means
+
          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 library routines. 
@@ -940,44 +967,43 @@ but are outside the scope of this page.
 
   
          The entropy seed used by the OpenSSL library is contained in a file,
 usually called
-.rnd, which must be available when starting the NTP daemon
+.rnd,
+which must be available when starting the NTP daemon
 or the
 ntp-keygen
 program. 
 The NTP daemon will first look for the file
 using the path specified by the
-randfile subcommand of the
-crypto configuration command. 
+randfile
+subcommand of the
+crypto
+configuration command. 
 If not specified in this way, or when starting the
 ntp-keygen
 program,
 the OpenSSL library will look for the file using the path specified
 by the
-.Ev
-RANDFILE
+Ev RANDFILE
 environment variable in the user home directory,
 whether root or some other user. 
 If the
-.Ev
-RANDFILE
+Ev RANDFILE
 environment variable is not present,
 the library will look for the
-.rnd file in the user home directory. 
+.rnd
+file in the user home directory. 
 If the file is not available or cannot be written,
 the daemon exits with a message to the system log and the program
 exits with a suitable error message. 
 
          
 
          
-
+
 
          
 
          
 
-
          Cryptographic
          
+
          Cryptographic Data Files
          
 
-
          Cryptographic
-Data
-Files
-All other file formats begin with two lines. 
+
          All other file formats begin with two lines. 
 The first contains the file name, including the generated host name
 and filestamp. 
 The second contains the datestamp in conventional Unix date format. 
@@ -996,15 +1022,15 @@ Since DES-CBC is deprecated in NTPv4, the only key format of interest
 is MD5 alphanumeric strings. 
 Following hte heard the keys are
 entered one per line in the format
-.D1
-Ar
-keyno
-type
-key
-where
-keyno is a positive integer in the range 1-65,535,
-type is the string MD5 defining the key format and
-key is the key itself,
+
               keyno type key
+
          
+  
          where
+keyno
+is a positive integer in the range 1-65,535,
+type
+is the string MD5 defining the key format and
+key
+is the key itself,
 which is a printable ASCII string 16 characters or less in length. 
 Each character is chosen from the 93 printable characters
 in the range 0x21 through 0x7f excluding space and the
@@ -1023,7 +1049,7 @@ in human readable ASCII format.
   
          The
 ntp-keygen
 program generates a MD5 symmetric keys file
-ntpkey_MD5key_NsArhostname.filestamp. 
+ntpkey_MD5key_hostname.filestamp. 
 Since the file contains private shared keys,
 it should be visible only to root and distributed by secure means
 to other subnet hosts. 
@@ -1077,7 +1103,7 @@ This software is released under the NTP license, <http://ntp.org/license>.
 
          
 
          
 Next: ,
-Up: Cryptographic
+Up: Cryptographic Data Files
 
          
 
          
 
@@ -1094,7 +1120,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.
 
-
          ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p343
+
          ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p344
 USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
@@ -1148,7 +1174,7 @@ please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 
          
 Next: ,
 Previous: ntp-keygen usage,
-Up: Cryptographic
+Up: Cryptographic Data Files
 
          
 
          
 
@@ -1168,7 +1194,7 @@ This option takes an argument number imbits.
 
          
 Next: ,
 Previous: ntp-keygen imbits,
-Up: Cryptographic
+Up: Cryptographic Data Files
 
          
 
          
 
@@ -1195,7 +1221,7 @@ this option is RSA-MD5.
 
          
 Next: ,
 Previous: ntp-keygen certificate,
-Up: Cryptographic
+Up: Cryptographic Data Files
 
          
 
          
 
@@ -1218,7 +1244,7 @@ available in "openssl -h" output.
 
          
 Next: ,
 Previous: ntp-keygen cipher,
-Up: Cryptographic
+Up: Cryptographic Data Files
 
          
 
          
 
@@ -1238,7 +1264,7 @@ intended for automatic key distribution by mail.
 
          
 Next: ,
 Previous: ntp-keygen id-key,
-Up: Cryptographic
+Up: Cryptographic Data Files
 
          
 
      
 
@@ -1258,7 +1284,7 @@ obsoleting any that may exist.
 
      
 Next: ,
 Previous: ntp-keygen gq-params,
-Up: Cryptographic
+Up: Cryptographic Data Files
 
      
 
      
 
@@ -1277,7 +1303,7 @@ This is the “generate rsa host key” option.
 
      
 Next: ,
 Previous: ntp-keygen host-key,
-Up: Cryptographic
+Up: Cryptographic Data Files
 
      
 
      
 
@@ -1297,7 +1323,7 @@ any that may exist.
 
      
 Next: ,
 Previous: ntp-keygen iffkey,
-Up: Cryptographic
+Up: Cryptographic Data Files
    @@ -1325,7 +1351,7 @@ ntpd's configuration file.

    Next: , Previous: ntp-keygen ident, -Up: Cryptographic +Up: Cryptographic Data Files
    @@ -1345,7 +1371,7 @@ This option takes an argument number lifetime.

    Next: , Previous: ntp-keygen lifetime, -Up: Cryptographic +Up: Cryptographic Data Files
    @@ -1358,7 +1384,7 @@ Generate MD5 keys, obsoleting any that may exist.

    Next: , Previous: ntp-keygen md5key, -Up: Cryptographic +Up: Cryptographic Data Files
    @@ -1378,7 +1404,7 @@ This option takes an argument number modulus.

    Next: , Previous: ntp-keygen modulus, -Up: Cryptographic +Up: Cryptographic Data Files
    @@ -1398,7 +1424,7 @@ public certificates.

    Next: , Previous: ntp-keygen pvt-cert, -Up: Cryptographic +Up: Cryptographic Data Files
    @@ -1419,7 +1445,7 @@ password and the cipher selected with -C/--cipher.

    Next: , Previous: ntp-keygen pvt-passwd, -Up: Cryptographic +Up: Cryptographic Data Files
    @@ -1439,7 +1465,7 @@ This option takes an argument string passwd.

    Next: , Previous: ntp-keygen get-pvt-passwd, -Up: Cryptographic +Up: Cryptographic Data Files
    @@ -1461,7 +1487,7 @@ sign key.

    Next: , Previous: ntp-keygen sign-key, -Up: Cryptographic +Up: Cryptographic Data Files
    @@ -1490,7 +1516,7 @@ of IFF, GQ, and MV client parameter files.

    Next: , Previous: ntp-keygen subject-name, -Up: Cryptographic +Up: Cryptographic Data Files
    @@ -1510,7 +1536,7 @@ a non-trusted certificate.

    Next: , Previous: ntp-keygen trusted-cert, -Up: Cryptographic +Up: Cryptographic Data Files
    @@ -1531,7 +1557,7 @@ identification scheme.

    Next: , Previous: ntp-keygen mv-params, -Up: Cryptographic +Up: Cryptographic Data Files
    @@ -1552,7 +1578,7 @@ This option takes an argument number num.

    Next: , Previous: ntp-keygen mv-keys, -Up: Cryptographic +Up: Cryptographic Data Files
    @@ -1624,7 +1650,7 @@ first letter of the argument is examined:

    Next: , Previous: ntp-keygen config, -Up: Cryptographic +Up: Cryptographic Data Files
    @@ -1642,15 +1668,17 @@ it to autogen-users@lists.sourceforge.net. Thank you.

    Next: , Previous: ntp-keygen exit status, -Up: Cryptographic +Up: Cryptographic Data Files

    ntp-keygen Usage

    The --p -password option specifies the write password and --q -password option the read password for previously encrypted files. +-p -password +option specifies the write password and +-q -password +option the read password for previously encrypted files. The ntp-keygen program prompts for the password if it reads an encrypted file @@ -1662,7 +1690,7 @@ as the write password by default.

    Next: , Previous: ntp-keygen Usage, -Up: Cryptographic +Up: Cryptographic Data Files
    @@ -1673,7 +1701,7 @@ Portions of this document came from FreeBSD.

    Previous: ntp-keygen Notes, -Up: Cryptographic +Up: Cryptographic Data Files
    diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in index d51cb728e..7e081e5ef 100644 --- a/util/ntp-keygen.man.in +++ b/util/ntp-keygen.man.in @@ -1,8 +1,8 @@ -.TH ntp-keygen @NTP_KEYGEN_MS@ "03 Jan 2013" "ntp (4.2.7p344)" "User Commands" +.TH ntp-keygen @NTP_KEYGEN_MS@ "04 Jan 2013" "ntp (4.2.7p345)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.man) .\" -.\" It has been AutoGen-ed January 3, 2013 at 01:11:02 PM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 4, 2013 at 09:04:36 AM by AutoGen 5.17.1pre11 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman-cmd.tpl .\" @@ -881,7 +881,7 @@ private keys. The default is three-key triple DES in CBC mode, equivalent to "@code{-C des-ede3-cbc". The openssl tool lists ciphers available in "\fBopenssl \-h\fP" output. .TP -.BR \-d ", " -\-debug\-level +.BR \-d ", " \-\-debug\-level Increase debug verbosity level. This option may appear an unlimited number of times. .sp @@ -892,24 +892,24 @@ This option may appear an unlimited number of times. This option takes an integer number as its argument. .sp .TP -.BR \-e ", " -\-id\-key +.BR \-e ", " \-\-id\-key Write IFF or GQ identity keys. .sp Write the IFF or GQ client keys to the standard output. This is intended for automatic key distribution by mail. .TP -.BR \-G ", " -\-gq\-params +.BR \-G ", " \-\-gq\-params Generate GQ parameters and keys. .sp Generate parameters and keys for the GQ identification scheme, obsoleting any that may exist. .TP -.BR \-H ", " -\-host\-key +.BR \-H ", " \-\-host\-key generate RSA host key. .sp Generate new host keys, obsoleting any that may exist. .TP -.BR \-I ", " -\-iffkey +.BR \-I ", " \-\-iffkey generate IFF parameters. .sp Generate parameters for the IFF identification scheme, obsoleting @@ -926,7 +926,7 @@ using \fB-s/--subject-name\fP following an '\fB@\fP' character, is also a part of the self-signed host certificate's subject and issuer names in the form \fBhost@group\fP and should match the '\fBcrypto ident\fP' or '\fBserver ident\fP' configuration in -\fBntpd\fP's configuration file. +\fBntpd\fP's configuration file. .TP .BR \-l " \fIlifetime\fP, " \-\-lifetime "=" \fIlifetime\fP set certificate lifetime. @@ -934,7 +934,7 @@ This option takes an integer number as its argument. .sp Set the certificate expiration to lifetime days from now. .TP -.BR \-M ", " -\-md5key +.BR \-M ", " \-\-md5key generate MD5 keys. .sp Generate MD5 keys, obsoleting any that may exist. @@ -952,7 +952,7 @@ in the range 256 through 2048 .sp The number of bits in the prime modulus. The default is 512. .TP -.BR \-P ", " -\-pvt\-cert +.BR \-P ", " \-\-pvt\-cert generate PC private certificate. .sp Generate a private certificate. By default, the program generates @@ -990,7 +990,7 @@ subject and issuer fields, as with \fB-i group\fP. The group name, or if not provided, the host name are also used in the file names of IFF, GQ, and MV client parameter files. .TP -.BR \-T ", " -\-trusted\-cert +.BR \-T ", " \-\-trusted\-cert trusted certificate (TC scheme). .sp Generate a trusted certificate. By default, the program generates @@ -1042,6 +1042,25 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. +cvt_prog='/usr/local/gnu/share/autogen/texi2man' +cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd + `/`basename "$cvt_prog"` +cd $tmp_dir +test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" +{ + list='synopsis description options option-presets' + for f in $list ; do cat $f ; echo ; done + rm \-f $list name + list='implementation-notes environment files examples exit-status errors + compatibility see-also conforming-to history authors copyright bugs + notes' + for f in $list ; do cat $f ; echo ; done > .end-doc + rm \-f $list + list=`ls \-1 *`' .end-doc' + for f in $list ; do cat $f ; echo ; done + rm \-f $list +} 1>.doc 2>/dev/null +sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .SH USAGE The p Ar password @@ -1087,8 +1106,7 @@ with older architectures such as SPARC IPC. .PP Please report bugs to http://bugs.ntp.org .Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version @VERSION@ of NTP. -Portions of this document came from FreeBSD. -.PP +This document corresponds to version 4.2.7p345 of NTP. +Portions of this document came from FreeBSD..Pp This manual page was \fIAutoGen\fP-erated from the \fBntp-keygen\fP option definitions. diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in index 33493b885..31994cbb1 100644 --- a/util/ntp-keygen.mdoc.in +++ b/util/ntp-keygen.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 3 2013 +.Dd January 4 2013 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.mdoc) .\" -.\" It has been AutoGen-ed January 3, 2013 at 01:11:11 PM by AutoGen 5.17.1pre11 +.\" It has been AutoGen-ed January 4, 2013 at 09:04:43 AM by AutoGen 5.17.1pre11 .\" From the definitions ntp-keygen-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -14,7 +14,7 @@ .\" Mixture of short (flag) options and long options .Op Fl flags .Op Fl flag Ar value -.Op Fl \-option-name Ar value +.Op Fl \-option\-name Ar value .Pp All arguments must be options. .Pp @@ -29,16 +29,16 @@ These files are used for cookie encryption, digital signature and challenge/response identification algorithms compatible with the Internet standard security infrastructure. .Pp -All files are in PEM-encoded printable ASCII format, +All files are in PEM\-encoded printable ASCII format, so they can be embedded as MIME attachments in mail to other sites and certificate authorities. By default, files are not encrypted. .Pp When used to generate message digest keys, the program produces a file -containing ten pseudo-random printable ASCII strings suitable for the +containing ten pseudo\-random printable ASCII strings suitable for the MD5 message digest algorithm included in the distribution. If the OpenSSL library is installed, it produces an additional ten -hex-encoded random bit strings suitable for the SHA1 and other message +hex\-encoded random bit strings suitable for the SHA1 and other message digest algorithms. The message digest keys file must be distributed and stored using secure means beyond the scope of NTP itself. @@ -90,7 +90,7 @@ is usually installed in Other files and links are usually installed in .Pa /usr/local/etc , which is normally in a shared filesystem in -NFS-mounted networks and cannot be changed by shared clients. +NFS\-mounted networks and cannot be changed by shared clients. The location of the keys directory can be changed by the .Ar keysdir configuration command in such cases. @@ -119,7 +119,7 @@ When run for the first time, or if all files with names beginning with have been removed, use the .Nm command without arguments to generate a -default RSA host key and matching RSA-MD5 certificate with expiration +default RSA host key and matching RSA\-MD5 certificate with expiration date one year hence. If run again without options, the program uses the existing keys and parameters and generates only a new certificate with @@ -154,16 +154,16 @@ option. The rules say cryptographic media should be generated with proventic filestamps, which means the host should already be synchronized before this program is run. -This of course creates a chicken-and-egg problem +This of course creates a chicken\-and\-egg problem when the host is started for the first time. Accordingly, the host time -should be set by some other means, such as eyeball-and-wristwatch, at +should be set by some other means, such as eyeball\-and\-wristwatch, at least so that the certificate lifetime is within the current year. After that and when the host is synchronized to a proventic source, the -certificate should be re-generated. +certificate should be re\-generated. .Pp Additional information on trusted groups and identity schemes is on the -.Dq Autokey Public-Key Authentication +.Dq Autokey Public\-Key Authentication page. .Pp The @@ -205,7 +205,7 @@ and generation date and time as comments. All files are installed by default in the keys directory .Pa /usr/local/etc , which is normally in a shared filesystem -in NFS-mounted networks. +in NFS\-mounted networks. The actual location of the keys directory and each file can be overridden by configuration commands, but this is not recommended. @@ -215,7 +215,7 @@ as noted later on this page. .Pp Normally, files containing private values, including the host key, sign key and identification parameters, -are permitted root read/write-only; +are permitted root read/write\-only; while others containing public values are permitted world readable. Alternatively, files containing private values can be encrypted and these files permitted world readable, @@ -254,7 +254,7 @@ When run for the first time, or if all .Cm ntpkey files have been removed, -the program generates a RSA host key file and matching RSA-MD5 certificate file, +the program generates a RSA host key file and matching RSA\-MD5 certificate file, which is all that is necessary in many cases. The program also generates soft links from the generic names to the respective files. @@ -297,7 +297,7 @@ in the root directory, so it is convenient to define the environment variable used by the OpenSSL library as the path to .Cm /.rnd . .Pp -Installing the keys as root might not work in NFS-mounted +Installing the keys as root might not work in NFS\-mounted shared file systems, as NFS clients may not be able to write to the shared keys directory, even as root. In this case, NFS clients can specify the files in another @@ -323,7 +323,7 @@ while the trusted name is used for the identity files. All files are installed by default in the keys directory .Pa /usr/local/etc , which is normally in a shared filesystem -in NFS-mounted networks. +in NFS\-mounted networks. The actual location of the keys directory and each file can be overridden by configuration commands, but this is not recommended. @@ -333,7 +333,7 @@ as noted later on this page. .Pp Normally, files containing private values, including the host key, sign key and identification parameters, -are permitted root read/write-only; +are permitted root read/write\-only; while others containing public values are permitted world readable. Alternatively, files containing private values can be encrypted and these files permitted world readable, @@ -372,7 +372,7 @@ When run for the first time, or if all .Cm ntpkey files have been removed, -the program generates a RSA host key file and matching RSA-MD5 certificate file, +the program generates a RSA host key file and matching RSA\-MD5 certificate file, which is all that is necessary in many cases. The program also generates soft links from the generic names to the respective files. @@ -415,7 +415,7 @@ in the root directory, so it is convenient to define the environment variable used by the OpenSSL library as the path to .Cm /.rnd . .Pp -Installing the keys as root might not work in NFS-mounted +Installing the keys as root might not work in NFS\-mounted shared file systems, as NFS clients may not be able to write to the shared keys directory, even as root. In this case, NFS clients can specify the files in another @@ -448,7 +448,7 @@ section of .Xr ntp.conf 5 . The default cryptotype uses RSA encryption, MD5 message digest and TC identification. -First, configure a NTP subnet including one or more low-stratum +First, configure a NTP subnet including one or more low\-stratum trusted hosts from which all other hosts derive synchronization directly or indirectly. Trusted hosts have trusted certificates; @@ -490,7 +490,7 @@ is either .Cm RSA or .Cm DSA . -The most often need to do this is when a DSA-signed certificate is used. +The most often need to do this is when a DSA\-signed certificate is used. If it is necessary to use a different certificate scheme than the default, run .Nm @@ -553,7 +553,7 @@ On trusted host alice run to generate the host key file .Pa ntpkey_RSAkey_ Ns Ar alice.filestamp and trusted private certificate file -.Pa ntpkey_RSA-MD5_cert_ Ns Ar alice.filestamp . +.Pa ntpkey_RSA\-MD5_cert_ Ns Ar alice.filestamp . Copy both files to all group hosts; they replace the files which would be generated in other schemes. On each host bob install a soft link from the generic name @@ -666,16 +666,16 @@ Select certificate message digest/signature encryption scheme. The .Ar scheme can be one of the following: -. Cm RSA-MD2 , RSA-MD5 , RSA-SHA , RSA-SHA1 , RSA-MDC2 , RSA-RIPEMD160 , DSA-SHA , +. Cm RSA\-MD2 , RSA\-MD5 , RSA\-SHA , RSA\-SHA1 , RSA\-MDC2 , RSA\-RIPEMD160 , DSA\-SHA , or -.Cm DSA-SHA1 . +.Cm DSA\-SHA1 . Note that RSA schemes must be used with a RSA sign key and DSA schemes must be used with a DSA sign key. The default without this option is -.Cm RSA-MD5 . +.Cm RSA\-MD5 . .It Fl d Enable debugging. -This option displays the cryptographic data produced in eye-friendly billboards. +This option displays the cryptographic data produced in eye\-friendly billboards. .It Fl e Write the IFF client keys to the standard output. This is intended for automatic key distribution by mail. @@ -704,7 +704,7 @@ By default, the program generates public certificates. .It Fl p Ar password Encrypt generated files containing private data with .Ar password -and the DES-CBC algorithm. +and the DES\-CBC algorithm. .It Fl q Set the password for reading files to password. .It Fl S Oo Cm RSA | DSA Oc @@ -718,14 +718,14 @@ This is used for the issuer field in certificates and in the file name for identity files. .It Fl T Generate a trusted certificate. -By default, the program generates a non-trusted certificate. +By default, the program generates a non\-trusted certificate. .It Fl V Ar nkeys -Generate parameters and keys for the Mu-Varadharajan (MV) identification scheme. +Generate parameters and keys for the Mu\-Varadharajan (MV) identification scheme. .El .Ss Random Seed File All cryptographically sound key generation schemes must have means to randomize the entropy seed used to initialize -the internal pseudo-random number generator used +the internal pseudo\-random number generator used by the library routines. The OpenSSL library uses a designated random seed file for this purpose. The file must be available when starting the NTP daemon and @@ -738,7 +738,7 @@ It is important to understand that entropy must be evolved for each generation, for otherwise the random number sequence would be predictable. Various means dependent on external events, such as keystroke intervals, -can be used to do this and some systems have built-in entropy sources. +can be used to do this and some systems have built\-in entropy sources. Suitable means are described in the OpenSSL software documentation, but are outside the scope of this page. .Pp @@ -783,19 +783,19 @@ program and .Xr ntpd @NTPD_MS@ daemon. Cryptographic values are encoded first using ASN.1 rules, -then encrypted if necessary, and finally written PEM-encoded +then encrypted if necessary, and finally written PEM\-encoded printable ASCII format preceded and followed by MIME content identifier lines. .Pp The format of the symmetric keys file is somewhat different than the other files in the interest of backward compatibility. -Since DES-CBC is deprecated in NTPv4, the only key format of interest +Since DES\-CBC is deprecated in NTPv4, the only key format of interest is MD5 alphanumeric strings. Following hte heard the keys are entered one per line in the format .D1 Ar keyno type key where .Ar keyno -is a positive integer in the range 1-65,535, +is a positive integer in the range 1\-65,535, .Ar type is the string MD5 defining the key format and .Ar key @@ -856,7 +856,6 @@ certificate scheme. scheme is one of RSA\-MD2, RSA\-MD5, RSA\-SHA, RSA\-SHA1, RSA\-MDC2, RSA\-RIPEMD160, DSA\-SHA, or DSA\-SHA1. -.sp Select the certificate message digest/signature encryption scheme. Note that RSA schemes must be used with a RSA sign key and DSA schemes must be used with a DSA sign key. The default without @@ -868,32 +867,30 @@ Select the cipher which is used to encrypt the files containing private keys. The default is three\-key triple DES in CBC mode, equivalent to "@code{\-C des\-ede3\-cbc". The openssl tool lists ciphers available in "\fBopenssl \-h\fP" output. -.It \-d ", " -\-debug\-level +.It \-d ", " \-\-debug\-level Increase debug verbosity level. This option may appear an unlimited number of times. .sp -.sp .It \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP Set the debug verbosity level. This option may appear an unlimited number of times. This option takes an integer number as its argument. .sp -.sp -.It \-e ", " -\-id\-key +.It \-e ", " \-\-id\-key Write IFF or GQ identity keys. .sp Write the IFF or GQ client keys to the standard output. This is intended for automatic key distribution by mail. -.It \-G ", " -\-gq\-params +.It \-G ", " \-\-gq\-params Generate GQ parameters and keys. .sp Generate parameters and keys for the GQ identification scheme, obsoleting any that may exist. -.It \-H ", " -\-host\-key +.It \-H ", " \-\-host\-key generate RSA host key. .sp Generate new host keys, obsoleting any that may exist. -.It \-I ", " -\-iffkey +.It \-I ", " \-\-iffkey generate IFF parameters. .sp Generate parameters for the IFF identification scheme, obsoleting @@ -909,13 +906,13 @@ using \fB\-s/\-\-subject\-name\fP following an '\fB@\fP' character, is also a part of the self\-signed host certificate's subject and issuer names in the form \fBhost@group\fP and should match the \'\fBcrypto ident\fP' or '\fBserver ident\fP' configuration in -\fBntpd\fP's configuration file. +\fBntpd\fP's configuration file. .It \-l " \fIlifetime\fP, " \-\-lifetime "=" \fIlifetime\fP set certificate lifetime. This option takes an integer number as its argument. .sp Set the certificate expiration to lifetime days from now. -.It \-M ", " -\-md5key +.It \-M ", " \-\-md5key generate MD5 keys. .sp Generate MD5 keys, obsoleting any that may exist. @@ -931,7 +928,7 @@ in the range 256 through 2048 .in -4 .sp The number of bits in the prime modulus. The default is 512. -.It \-P ", " -\-pvt\-cert +.It \-P ", " \-\-pvt\-cert generate PC private certificate. .sp Generate a private certificate. By default, the program generates @@ -964,7 +961,7 @@ leaving the host name unchanged while appending \fB@group\fP to the subject and issuer fields, as with \fB\-i group\fP. The group name, or if not provided, the host name are also used in the file names of IFF, GQ, and MV client parameter files. -.It \-T ", " -\-trusted\-cert +.It \-T ", " \-\-trusted\-cert trusted certificate (TC scheme). .sp Generate a trusted certificate. By default, the program generates @@ -982,15 +979,15 @@ This option takes an integer number as its argument. This option has not been fully documented. .It \-? , " \-\-help" Display usage information and exit. -.It \-! , " \-\-more-help" +.It \-! , " \-\-more\-help" Pass the extended usage information through a pager. -.It \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]" +.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]" Save the option state to \fIrcfile\fP. The default is the \fIlast\fP configuration file listed in the \fBOPTION PRESETS\fP section, below. -.It \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts" +.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts" Load options from \fIrcfile\fP. -The \fIno-load-opts\fP form will disable the loading -of earlier RC/INI files. \fI\-\-no-load-opts\fP is handled early, +The \fIno\-load\-opts\fP form will disable the loading +of earlier RC/INI files. \fI\-\-no\-load\-opts\fP is handled early, out of order. .It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]" Output version of program and exit. The default mode is `v', a simple @@ -1002,7 +999,7 @@ Any option that is not marked as \fInot presettable\fP may be preset by loading values from configuration ("RC" or ".INI") file(s) and values from environment variables named: .nf - \fBNTP_KEYGEN_\fP or \fBNTP_KEYGEN\fP + \fBNTP_KEYGEN_\fP or \fBNTP_KEYGEN\fP .fi .ad The environmental presets take precedence (are processed later than) @@ -1010,6 +1007,25 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. +cvt_prog='/usr/local/gnu/share/autogen/texi2mdoc' +cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd + `/`basename "$cvt_prog"` +cd $tmp_dir +test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" +{ + list='synopsis description options option\-presets' + for f in $list ; do cat $f ; echo ; done + rm \-f $list name + list='implementation\-notes environment files examples exit\-status errors + compatibility see\-also conforming\-to history authors copyright bugs + notes' + for f in $list ; do cat $f ; echo ; done > .end\-doc + rm \-f $list + list=`ls \-1 *`' .end\-doc' + for f in $list ; do cat $f ; echo ; done + rm \-f $list +} 1>.doc 2>/dev/null +sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog .Sh USAGE The .Fl p Ar password @@ -1038,12 +1054,12 @@ The operation failed or the command syntax was not valid. A specified configuration file could not be loaded. .It 70 " (EX_SOFTWARE)" libopts had an internal operational error. Please report -it to autogen-users@lists.sourceforge.net. Thank you. +it to autogen\-users@lists.sourceforge.net. Thank you. .El .Sh "AUTHORS" The University of Delaware .Sh "COPYRIGHT" -Copyright (C) 1970-2013 The University of Delaware all rights reserved. +Copyright (C) 1970\-2013 The University of Delaware all rights reserved. This program is released under the terms of the NTP license, . .Sh BUGS It can take quite a while to generate some cryptographic values, @@ -1053,8 +1069,7 @@ with older architectures such as SPARC IPC. .Pp Please report bugs to http://bugs.ntp.org .Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version @VERSION@ of NTP. -Portions of this document came from FreeBSD. -.Pp -This manual page was \fIAutoGen\fP-erated from the \fBntp-keygen\fP +This document corresponds to version 4.2.7p345 of NTP. +Portions of this document came from FreeBSD..Pp +This manual page was \fIAutoGen\fP\-erated from the \fBntp\-keygen\fP option definitions.