@@ -392,9 +395,9 @@ default.

Auxiliary

Auxiliary +

Auxiliary Commands -

Ic: This command enables reception of broadcast server messages to any local interface (type b) address. Upon receiving a message for @@ -436,9 +439,9 @@ both the server and client should operate using symmetric-key or public-key authentication as described in AuthenticationAuthentication Options -. - -
+. +

@@ -446,7 +449,7 @@ Options

Authentication

Authentication +

Authentication Support Authentication support allows the NTP client to verify that the server is in fact known and trusted and not an intruder intending @@ -464,7 +467,7 @@ 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. -

NTPv4 retains the NTPv3 scheme, properly described as symmetric key +

NTPv4 retains the NTPv3 scheme, properly described as symmetric key cryptography and, in addition, provides a new Autokey scheme based on public key cryptography. Public key cryptography is generally considered more secure @@ -479,14 +482,14 @@ which can be provided by commercial services or produced by utility programs in the OpenSSL software library or the NTPv4 distribution. -

While the algorithms for symmetric key cryptography are +

While the algorithms for symmetric key cryptography are included in the NTPv4 distribution, public key cryptography requires the OpenSSL software library to be installed before building the NTP distribution. Directions for doing that are on the Building and Installing the Distribution page. -

Authentication is configured separately for each association +

Authentication is configured separately for each association using the key or autokey subcommand on the @@ -500,7 +503,7 @@ options described below specify the locations of the key files, if other than default, which symmetric keys are trusted and the interval between various operations, if other than default. -

Authentication is always enabled, +

Authentication is always enabled, although ineffective if not configured as described below. If a NTP packet arrives @@ -519,7 +522,7 @@ preliminary protocol exchange to obtain the server certificate, verify its credentials and initialize the protocol -

The +

The auth flag controls whether new associations or remote configuration commands require cryptographic authentication. This flag can be set or reset by the @@ -552,7 +555,7 @@ and remote configuration commands and, in particular, the flag has no effect on the authentication process itself. -

An attractive alternative where multicast support is available +

An attractive alternative where multicast support is available is manycast mode, in which clients periodically troll for servers as described in the AutomaticAutomatic @@ -569,7 +572,7 @@ since the client finds them during regular operation, and the configuration files for all clients can be identical. -

The security model and protocol schemes for +

The security model and protocol schemes for both symmetric key and public key cryptography are summarized below; further details are in the briefings, papers @@ -585,7 +588,7 @@ http://www.ntp.org/

Symmetric-Key

Symmetric-Key +

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 @@ -607,7 +610,7 @@ and ntpdc(1ntpdcmdoc) utility programs. -

When +

When ntpd(1ntpdmdoc) is first started, it reads the key file specified in the keys configuration command and installs the keys @@ -638,7 +641,7 @@ utility.

Public

Public +

Public Key Cryptography NTPv4 supports the original NTPv3 symmetric key scheme @@ -655,7 +658,7 @@ Using all of these schemes provides strong security against replay with or without modification, spoofing, masquerade and most forms of clogging attacks. -

The Autokey protocol has several modes of operation +

The Autokey protocol has several modes of operation corresponding to the various NTP modes supported. Most modes use a special cookie which can be computed independently by the client and server, @@ -669,7 +672,7 @@ current status, briefing slides and reading list on the Authentication page. -

The specific cryptographic environment used by Autokey servers +

The specific cryptographic environment used by Autokey servers and clients is determined by a set of files and soft links generated by the ntp-keygen(1ntpkeygenmdoc) @@ -689,7 +692,7 @@ The current NTP distribution supports all the schemes in the OpenSSL library, including those based on RSA and DSA digital signatures. -

NTP secure groups can be used to define cryptographic compartments +

NTP secure groups can be used to define cryptographic compartments and security hierarchies. It is important that every host in the group be able to construct a certificate trail to one @@ -709,7 +712,7 @@ a trail to at least one trusted host.

Naming

Naming +

Naming and Addressing It is important to note that Autokey does not use DNS to @@ -722,7 +725,7 @@ The name appears in the host certificate in either or both the subject and issuer fields, so protection against DNS compromise is essential. -

By convention, the name of an Autokey host is the name returned +

By convention, the name of an Autokey host is the name returned by the Unix gethostname(2) system call or equivalent in other systems. @@ -731,7 +734,7 @@ model, there are no provisions to allow alternate names or aliases. However, this is not to say that DNS aliases, different names for each interface, etc., are constrained in any way. -

It is also important to note that Autokey verifies authenticity +

It is also important to note that Autokey verifies authenticity using the host name, network address and public keys, all of which are bound together by the protocol specifically to deflect masquerade attacks. @@ -751,7 +754,7 @@ and corporate NTP servers are operated outside firewall perimeters.

Operation

Operation +

Operation A specific combination of authentication scheme (none, symmetric key, public key) and identity scheme is called a cryptotype, although not all combinations are compatible. @@ -764,7 +767,7 @@ Note however that some cryptotype combinations may successfully interoperate with each other, but may not represent good security practice. -

The cryptotype of an association is determined at the time +

The cryptotype of an association is determined at the time of mobilization, either at configuration time or some time later when a message of appropriate cryptotype arrives. When mobilized by a @@ -778,7 +781,7 @@ using the symmetric key ID specified; if the autokey subcommand is present, the association is authenticated using Autokey. -

When multiple identity schemes are supported in the Autokey +

When multiple identity schemes are supported in the Autokey protocol, the first message exchange determines which one is used. The client request message contains bits corresponding to which schemes it has available. @@ -787,7 +790,7 @@ contains bits corresponding to which schemes it has available. Both server and client match the received bits with their own and select a common scheme. -

Following the principle that time is a public value, +

Following the principle that time is a public value, a server responds to any client packet that matches its cryptotype capabilities. Thus, a server receiving @@ -801,7 +804,7 @@ with the first packet received. By default, unauthenticated associations will not be mobilized unless overridden in a decidedly dangerous way. -

Some examples may help to reduce confusion. +

Some examples may help to reduce confusion. Client Alice has no specific cryptotype selected. Server Bob has both a symmetric key file and minimal Autokey files. Alice's unauthenticated messages arrive at Bob, who replies with @@ -817,13 +820,13 @@ Bob sends Cathy a thing called a crypto-NAK, which tells her something broke. She can see the evidence using the ntpq program. -

Denise has rolled her own host key and certificate. +

Denise has rolled her own host key and certificate. She also uses one of the identity schemes as Bob. She sends the first Autokey message to Bob and they both dance the protocol authentication and identity steps. If all comes out okay, Denise and Bob continue as described above. -

It should be clear from the above that Bob can support +

It should be clear from the above that Bob can support all the girls at the same time, as long as he has compatible authentication and identity credentials. Now, Bob can act just like the girls in his own choice of servers; @@ -840,7 +843,7 @@ with one server and no authentication with another might not be wise.

Key

Key +

Key Management The cryptographic values used by the Autokey protocol are incorporated as a set of files generated by the @@ -860,7 +863,7 @@ utility programs. The remaining files are necessary only for the Autokey protocol. -

Certificates imported from OpenSSL or public certificate +

Certificates imported from OpenSSL or public certificate authorities have certian limitations. The certificate should be in ASN.1 syntax, X.509 Version 3 format and encoded in PEM, which is the same format @@ -883,9 +886,9 @@ contain the value

Authentication

Authentication +

Authentication Commands -

Ic

Specifies the interval between regenerations of the session key list used with the Autokey protocol. Note that the size of the key @@ -926,7 +929,7 @@ in the keysdir command or default /usr/local/etc. Following are the subcommands: -

Cm: Specifies the location of the required host public certificate file. This overrides the link ntpkey_cert_NsArhostname @@ -967,9 +970,9 @@ the link ntpkey_sign_NsArhostname in the keys directory. If this file is -not found, the host key is also the sign key. - -
.It +not found, the host key is also the sign key. +

+ .It Ic keys Ar @@ -1050,11 +1053,11 @@ integers with values from 1 to 65,534.

Error

Error +

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

101: (bad field format or length) The packet has invalid version, length or format.
102: (bad timestamp) @@ -1087,9 +1090,9 @@ The leapseconds table is missing, corrupted or bogus.
113: (bad or missing certificate) The certificate is missing, corrupted or bogus.
114: (bad or missing identity) -The identity key is missing, corrupt or bogus. - -
+The identity key is missing, corrupt or bogus. +

@@ -1097,7 +1100,7 @@ The identity key is missing, corrupt or bogus.

Monitoring

Monitoring +

Monitoring Support ntpd(1ntpdmdoc) includes a comprehensive monitoring facility suitable @@ -1125,13 +1128,13 @@ automatically summarized and archived for retrospective analysis.

Monitoring

Monitoring +

Monitoring Commands -

Ic

Enables writing of statistics records. Currently, four kinds of name statistics are supported. -

Cm

Enables recording of clock driver statistics information. Each update received from a clock driver appends a line of the following form to @@ -1141,7 +1144,7 @@ the file generation set named 49213 525.624 127.127.4.1 93 226 00:08:29.606 D .Ed -

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. @@ -1162,7 +1165,7 @@ following form to the file generation set named 49213 525.624 127.127.4.1 message .Ed -

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 @@ -1180,7 +1183,7 @@ the file generation set named 50935 75440.031 0.000006019 13.778190 0.000351733 0.0133806 .Ed -

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 - @@ -1198,7 +1201,7 @@ generation set named 48773 10847.650 127.127.4.1 9714 -0.001605376 0.000000000 0.001424877 0.000958674 .Ed -

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, @@ -1219,7 +1222,7 @@ following form to the file generation set named 50928 2132.543 128.4.1.1 128.4.1.20 3102453281.584327000 3102453281.58622800031 02453332.540806000 3102453332.541458000 .Ed -

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 @@ -1238,12 +1241,12 @@ set named 50928 2132.543 36000 81965 0 9546 56 71793 512 540 10 147 .Ed -

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 @@ -1253,9 +1256,9 @@ line.
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. - -
.It +
Rate: Number of packets discarded due to rate limitation. +

+ .It Cm statsdir Ar @@ -1293,10 +1296,10 @@ 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. @@ -1304,7 +1307,7 @@ Filenames of set members are built from three concatenated elements Cm prefix, Cm filename and Cm suffix: -

Cm: This is a constant filename path. It is not subject to modifications via the @@ -1320,7 +1323,10 @@ For example, the prefix used with statsdir option explained above.
Cm: This string is directly concatenated to the prefix mentioned above (no intervening -/ ) . +/). +/ +) +. This can be modified using the file argument to the filegen statement. @@ -1331,9 +1337,9 @@ 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. It is -generated according to the type of a file set. - -
.It +generated according to the type of a file set. +

+ .It Cm type Ar @@ -1341,7 +1347,7 @@ typename 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 server. @@ -1403,8 +1409,8 @@ 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 +disable.

+ .It Cm link | @@ -1441,7 +1447,7 @@ Enables or disables the recording function.

Access

Access +

Access Control Support The @@ -1463,7 +1469,7 @@ page 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 @@ -1475,7 +1481,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. @@ -1498,7 +1504,7 @@ the restrictions is by restarting the server.

The

The +

The Kiss-of-Death Packet Ordinarily, packets denied service are simply dropped with no @@ -1520,7 +1526,7 @@ the code is "DENY"; if the 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 @@ -1540,10 +1546,10 @@ It will happen at the server only if the server operator cooperates.

Access

Access +

Access Control Commands -

Xo

[average avg ] [minimum min ] [monitor prob ] @@ -1590,7 +1596,7 @@ 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 @@ -1659,9 +1665,10 @@ 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. +
Cm: Deny packets that do not match the current NTP version. +

Default restriction list entries with the flags ignore, interface, +

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. @@ -1678,7 +1685,7 @@ NTP server is unrestricted).

Automatic

Automatic +

Automatic NTP Configuration Options @@ -1690,7 +1697,7 @@ Options

Manycasting

Manycasting +

Manycasting Manycasting is a automatic discovery and configuration paradigm new to NTPv4. It is intended as a means for a multicast client @@ -1703,14 +1710,14 @@ 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 +

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 +

Manycasting can be used with either symmetric key or public key cryptography. The public key infrastructure (PKI) offers the best protection against compromised keys @@ -1724,7 +1731,7 @@ 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 +

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 @@ -1739,7 +1746,7 @@ 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 +

Manycast servers configured with the manycastserver command listen on the specified group address for manycast client messages. Note the distinction between manycast client, @@ -1751,7 +1758,7 @@ 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 +

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 @@ -1773,7 +1780,7 @@ distance. The surviving associations then continue in ordinary client/server mode. -

The manycast client polling strategy is designed to reduce +

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. @@ -1793,7 +1800,7 @@ 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 +

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 @@ -1812,7 +1819,7 @@ For manycast service minsane should be explicitly set to 4, assuming at least that number of servers are available. -

If at least +

If at least minclock servers are found, the manycast poll interval is immediately set to eight times maxpoll. If less than @@ -1827,7 +1834,7 @@ 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 +

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 @@ -1835,7 +1842,7 @@ 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 +

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, @@ -1873,7 +1880,7 @@ 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 +

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 @@ -1891,7 +1898,7 @@ 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 +

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 @@ -1901,7 +1908,7 @@ For stratum 3 and above servers the Thus, all stratum 3 configuration files are identical, all stratum 4 files are identical and so forth. -

Once operations have stabilized in this scenario, +

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, @@ -1913,7 +1920,7 @@ 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 +

Some administrators prefer to avoid running ntpd(1ntpdmdoc) continuously and run either ntpdate(8) @@ -1940,7 +1947,7 @@ configuration file.

Manycast

Manycast +

Manycast Interactions with Autokey @@ -1957,7 +1964,7 @@ 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 +

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 @@ -1981,9 +1988,9 @@ from there while collecting all servers in scope.

Manycast

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 @@ -1993,7 +2000,7 @@ 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. @@ -2027,9 +2034,9 @@ 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 +a single falseticker. +

+ .It Cm ttl Ar @@ -2050,7 +2057,7 @@ multiples of 32 starting at 31.

Reference

Reference +

Reference Clock Support The NTP Version 4 daemon supports some three dozen different radio, @@ -2090,7 +2097,7 @@ page provided in /usr/share/doc/ntp). -

A reference clock will generally (though not always) be a radio +

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. @@ -2106,7 +2113,7 @@ 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, +

For the purposes of configuration, ntpd(1ntpdmdoc) treats reference clocks in a manner analogous to normal NTP peers as much @@ -2136,7 +2143,7 @@ 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 +

The server command is used to configure a reference clock, where the address argument in that command @@ -2165,7 +2172,7 @@ meaning only for selected clock drivers. See the individual clock driver document pages for additional information. -

The +

The fudge command is used to provide additional information for individual clock drivers and normally follows immediately after the @@ -2181,7 +2188,7 @@ 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. +

The stratum number of a reference clock is by default zero. Since the ntpd(1ntpdmdoc) daemon adds one to the stratum of each @@ -2207,10 +2214,10 @@ these options apply to all clock drivers.

Reference

Reference +

Reference Clock Commands -

Xo

.Sm off .Li @@ -2229,7 +2236,7 @@ on 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 @@ -2256,9 +2263,9 @@ most directly connected reference clocks, both 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 +The allowable range is 4 (16 s) to 17 (36.4 h) inclusive. +

+ .It Xo Ic fudge @@ -2292,7 +2299,7 @@ is possible at run time using the program. The options are interpreted as follows: -

Ic: ...
Ic
Ic: The data carried by NTP mode 6 messages consists of a list of items of the form -variable_name=value , +variable_name=value, +, where the =value is ignored, and can be omitted, @@ -246,7 +247,8 @@ Variables which ntpq thinks should have a decodable value but didn't are marked with a trailing -\&? . +\&?. +.
Xo: debug .Oo more | less | off .Oc With no argument, displays the current debug level. @@ -346,7 +348,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.7p338 +
ntpq - standard NTP query program - Ver. 4.2.7p339 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 598569b5b..0ad89cc65 100644 --- a/ntpq/ntpq.man.in +++ b/ntpq/ntpq.man.in @@ -1,8 +1,8 @@ -.TH ntpq @NTPQ_MS@ "26 Dec 2012" "4.2.7p339" "User Commands" +.TH ntpq @NTPQ_MS@ "29 Dec 2012" "4.2.7p340" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpq-opts.man) .\" -.\" It has been AutoGen-ed December 26, 2012 at 04:11:16 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:29:17 AM by AutoGen 5.16.2 .\" From the definitions ntpq-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in index 970f0b519..c8853356b 100644 --- a/ntpq/ntpq.mdoc.in +++ b/ntpq/ntpq.mdoc.in @@ -1,9 +1,9 @@ -.Dd December 26 2012 +.Dd December 29 2012 .Dt NTPQ @NTPQ_MS@ User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpq-opts.mdoc) .\" -.\" It has been AutoGen-ed December 26, 2012 at 04:11:21 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:29:23 AM by AutoGen 5.16.2 .\" From the definitions ntpq-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpsnmpd/invoke-ntpsnmpd.texi b/ntpsnmpd/invoke-ntpsnmpd.texi index c427ee95f..bef1d3a62 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 December 26, 2012 at 04:11:35 AM by AutoGen 5.16.2 +# It has been AutoGen-ed December 29, 2012 at 09:29:36 AM by AutoGen 5.16.2 # 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.7p339 +ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p340 USAGE: ntpsnmpd [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -n no nofork Do not fork @@ -187,7 +187,6 @@ it to autogen-users@@lists.sourceforge.net. Thank you. @code{ntpsnmpd} currently uses a private MIB OID, @quoteleft{}enterprises.5597@quoteright{}, -, which is the Meinberg top level OEM OID, and @quoteleft{}99@quoteright{} is the temporary working space for this project. diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c index 1a042f6ff..87b7f607e 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 December 26, 2012 at 04:11:24 AM by AutoGen 5.16.2 + * It has been AutoGen-ed December 29, 2012 at 09:29:26 AM by AutoGen 5.16.2 * 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.7p339\n" +/* 0 */ "ntpsnmpd 4.2.7p340\n" "Copyright (C) 1970-2012 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.7p339\n" +/* 1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p340\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.7p339"; +/* 1542 */ "ntpsnmpd 4.2.7p340"; /* * nofork option description: diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 6d65469b5..b01d0a504 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 December 26, 2012 at 04:11:24 AM by AutoGen 5.16.2 + * It has been AutoGen-ed December 29, 2012 at 09:29:25 AM by AutoGen 5.16.2 * 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.7p339" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd 4.2.7p339" +#define NTPSNMPD_VERSION "4.2.7p340" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd 4.2.7p340" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman index c6447c5aa..b7ff7955b 100644 --- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman +++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman @@ -1,8 +1,8 @@ -.TH ntpsnmpd 1ntpsnmpdman "26 Dec 2012" "4.2.7p339" "User Commands" +.TH ntpsnmpd 1ntpsnmpdman "29 Dec 2012" "4.2.7p340" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.man) .\" -.\" It has been AutoGen-ed December 26, 2012 at 04:11:32 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:29:32 AM by AutoGen 5.16.2 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc index f91ba9a8a..fd97a27a8 100644 --- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc +++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc @@ -1,9 +1,9 @@ -.Dd December 26 2012 +.Dd December 29 2012 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.mdoc) .\" -.\" It has been AutoGen-ed December 26, 2012 at 04:11:37 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:29:38 AM by AutoGen 5.16.2 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpsnmpd/ntpsnmpd.html b/ntpsnmpd/ntpsnmpd.html index 1b346927a..2687ac7fc 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.7p339 of ntpsnmpd. +
This document applies to version 4.2.7p340 of ntpsnmpd.

ntpsnmpd Description: Description diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in index 8735d6a0e..104f09e9a 100644 --- a/ntpsnmpd/ntpsnmpd.man.in +++ b/ntpsnmpd/ntpsnmpd.man.in @@ -1,8 +1,8 @@ -.TH ntpsnmpd @NTPSNMPD_MS@ "26 Dec 2012" "4.2.7p339" "User Commands" +.TH ntpsnmpd @NTPSNMPD_MS@ "29 Dec 2012" "4.2.7p340" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.man) .\" -.\" It has been AutoGen-ed December 26, 2012 at 04:11:32 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:29:32 AM by AutoGen 5.16.2 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in index 564bc7dc7..52e4ce850 100644 --- a/ntpsnmpd/ntpsnmpd.mdoc.in +++ b/ntpsnmpd/ntpsnmpd.mdoc.in @@ -1,9 +1,9 @@ -.Dd December 26 2012 +.Dd December 29 2012 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.mdoc) .\" -.\" It has been AutoGen-ed December 26, 2012 at 04:11:37 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:29:38 AM by AutoGen 5.16.2 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/packageinfo.sh b/packageinfo.sh index 9ad0bcbfc..2944c2cad 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=339 +point=340 ### 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 c6e6de3c7..4f26e52a9 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 December 25, 2012 at 12:47:19 PM by AutoGen 5.16.2 +# It has been AutoGen-ed December 29, 2012 at 09:05:52 AM by AutoGen 5.16.2 # From the definitions ntp-wait-opts.def # and the template file agtexi-cmd.tpl @end ignore diff --git a/scripts/ntp-wait.1ntp-waitman b/scripts/ntp-wait.1ntp-waitman index 03c398856..5a7c2c21d 100644 --- a/scripts/ntp-wait.1ntp-waitman +++ b/scripts/ntp-wait.1ntp-waitman @@ -1,8 +1,8 @@ -.TH ntp-wait 1ntp-waitman "25 Dec 2012" "ntp (4.2.7p339)" "User Commands" +.TH ntp-wait 1ntp-waitman "29 Dec 2012" "ntp (4.2.7p340)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntp-wait-opts.man) .\" -.\" It has been AutoGen-ed December 25, 2012 at 12:47:15 PM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:05:49 AM by AutoGen 5.16.2 .\" From the definitions ntp-wait-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/scripts/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait.1ntp-waitmdoc index 43989fe54..07b65817e 100644 --- a/scripts/ntp-wait.1ntp-waitmdoc +++ b/scripts/ntp-wait.1ntp-waitmdoc @@ -1,9 +1,9 @@ -.Dd December 25 2012 +.Dd December 29 2012 .Dt NTP_WAIT 1ntp-waitmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp-wait-opts.mdoc) .\" -.\" It has been AutoGen-ed December 25, 2012 at 12:47:21 PM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:05:54 AM by AutoGen 5.16.2 .\" From the definitions ntp-wait-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/ntp-wait.html b/scripts/ntp-wait.html index 9c62c8be8..d7d5268f7 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.7p339 of ntp-wait. +
This document applies to version 4.2.7p340 of ntp-wait.

Short Contents
diff --git a/scripts/ntp-wait.man.in b/scripts/ntp-wait.man.in index 1ba5ef80c..fc4174dd8 100644 --- a/scripts/ntp-wait.man.in +++ b/scripts/ntp-wait.man.in @@ -1,8 +1,8 @@ -.TH ntp-wait @NTP_WAIT_MS@ "25 Dec 2012" "ntp (4.2.7p339)" "User Commands" +.TH ntp-wait @NTP_WAIT_MS@ "29 Dec 2012" "ntp (4.2.7p340)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntp-wait-opts.man) .\" -.\" It has been AutoGen-ed December 25, 2012 at 12:47:15 PM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:05:49 AM by AutoGen 5.16.2 .\" From the definitions ntp-wait-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/scripts/ntp-wait.mdoc.in b/scripts/ntp-wait.mdoc.in index 68acc20ca..23683d83c 100644 --- a/scripts/ntp-wait.mdoc.in +++ b/scripts/ntp-wait.mdoc.in @@ -1,9 +1,9 @@ -.Dd December 25 2012 +.Dd December 29 2012 .Dt NTP_WAIT @NTP_WAIT_MS@ User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp-wait-opts.mdoc) .\" -.\" It has been AutoGen-ed December 25, 2012 at 12:47:21 PM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:05:54 AM by AutoGen 5.16.2 .\" From the definitions ntp-wait-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/sntp/invoke-sntp.texi b/sntp/invoke-sntp.texi index d7d167c84..416c869c3 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 December 26, 2012 at 04:12:19 AM by AutoGen 5.16.2 +# It has been AutoGen-ed December 29, 2012 at 09:30:23 AM by AutoGen 5.16.2 # From the definitions sntp-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -43,7 +43,7 @@ synchronization distance, this will be reported as @code{'+/- ?'}. If the @emph{host} is different from the -@emph{IP,} +@emph{IP}, both will be displayed. Otherwise, only the @emph{IP} @@ -95,7 +95,7 @@ with a status code of 0. @exampleindent 0 @example -sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p339 +sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p340 USAGE: sntp [ - [] | --[@{=| @}] ]... \ [ hostname-or-IP ...] Flg Arg Option-Name Description diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index f1beb7f59..298b77403 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 December 25, 2012 at 12:44:42 PM by AutoGen 5.16.2 + * It has been AutoGen-ed December 29, 2012 at 09:03:15 AM by AutoGen 5.16.2 * 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.7p339\n" +/* 0 */ "sntp 4.2.7p340\n" "Copyright (C) 1970-2012 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.7p339\n" +/* 2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p340\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.7p339"; +/* 2485 */ "sntp 4.2.7p340"; /* * ipv4 option description with diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 7029ad2dd..fdb59f0e3 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 December 25, 2012 at 12:44:42 PM by AutoGen 5.16.2 + * It has been AutoGen-ed December 29, 2012 at 09:03:14 AM by AutoGen 5.16.2 * 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.7p339" -#define SNTP_FULL_VERSION "sntp 4.2.7p339" +#define SNTP_VERSION "4.2.7p340" +#define SNTP_FULL_VERSION "sntp 4.2.7p340" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman index 2bfa406ca..e4d89275c 100644 --- a/sntp/sntp.1sntpman +++ b/sntp/sntp.1sntpman @@ -1,8 +1,8 @@ -.TH sntp 1sntpman "26 Dec 2012" "4.2.7p339" "User Commands" +.TH sntp 1sntpman "29 Dec 2012" "4.2.7p340" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (sntp-opts.man) .\" -.\" It has been AutoGen-ed December 26, 2012 at 04:12:14 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:30:19 AM by AutoGen 5.16.2 .\" From the definitions sntp-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc index ccb5b6363..043d2414f 100644 --- a/sntp/sntp.1sntpmdoc +++ b/sntp/sntp.1sntpmdoc @@ -1,9 +1,9 @@ -.Dd December 26 2012 +.Dd December 29 2012 .Dt SNTP 1sntpmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (sntp-opts.mdoc) .\" -.\" It has been AutoGen-ed December 26, 2012 at 04:12:21 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:30:25 AM by AutoGen 5.16.2 .\" From the definitions sntp-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/sntp/sntp.html b/sntp/sntp.html index 60430bd60..774eef6bd 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.7p339 of sntp. +
This document applies to version 4.2.7p340 of sntp.
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -114,7 +114,7 @@ synchronization distance, this will be reported as '+/- ?'. If the host is different from the -IP, +IP, both will be displayed. Otherwise, only the IP @@ -170,7 +170,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.7p339 +
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p340 USAGE: sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \ [ hostname-or-IP ...] Flg Arg Option-Name Description diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in index 24dd2117b..202232b34 100644 --- a/sntp/sntp.man.in +++ b/sntp/sntp.man.in @@ -1,8 +1,8 @@ -.TH sntp @SNTP_MS@ "26 Dec 2012" "4.2.7p339" "User Commands" +.TH sntp @SNTP_MS@ "29 Dec 2012" "4.2.7p340" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (sntp-opts.man) .\" -.\" It has been AutoGen-ed December 26, 2012 at 04:12:14 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:30:19 AM by AutoGen 5.16.2 .\" From the definitions sntp-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in index 15f52f9ee..f7e989370 100644 --- a/sntp/sntp.mdoc.in +++ b/sntp/sntp.mdoc.in @@ -1,9 +1,9 @@ -.Dd December 26 2012 +.Dd December 29 2012 .Dt SNTP @SNTP_MS@ User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (sntp-opts.mdoc) .\" -.\" It has been AutoGen-ed December 26, 2012 at 04:12:21 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:30:25 AM by AutoGen 5.16.2 .\" From the definitions sntp-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/util/invoke-ntp-keygen.texi b/util/invoke-ntp-keygen.texi index e26c4a305..3310ea004 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 December 26, 2012 at 04:11:56 AM by AutoGen 5.16.2 +# It has been AutoGen-ed December 29, 2012 at 09:29:56 AM by AutoGen 5.16.2 # From the definitions ntp-keygen-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -792,7 +792,6 @@ 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 @quoteleft{}@quoteright{}# -# character. Note that the keys used by the @@ -874,7 +873,7 @@ with a status code of 0. @exampleindent 0 @example -ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p339 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p340 USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -b Num imbits identity modulus bits diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index 2365b4082..0cffd0ccd 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 December 26, 2012 at 04:11:42 AM by AutoGen 5.16.2 + * It has been AutoGen-ed December 29, 2012 at 09:29:44 AM by AutoGen 5.16.2 * 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.7p339\n" +/* 0 */ "ntp-keygen (ntp) 4.2.7p340\n" "Copyright (C) 1970-2012 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.7p339\n" +/* 2163 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p340\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.7p339"; +/* 2331 */ "ntp-keygen (ntp) 4.2.7p340"; /* * imbits option description: diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index e769bed25..0a3de2113 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 December 26, 2012 at 04:11:41 AM by AutoGen 5.16.2 + * It has been AutoGen-ed December 29, 2012 at 09:29:43 AM by AutoGen 5.16.2 * 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.7p339" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) 4.2.7p339" +#define NTP_KEYGEN_VERSION "4.2.7p340" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) 4.2.7p340" /* * 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 cfe517ac0..37e5c0eaf 100644 --- a/util/ntp-keygen.1ntp-keygenman +++ b/util/ntp-keygen.1ntp-keygenman @@ -1,8 +1,8 @@ -.TH ntp-keygen 1ntp-keygenman "26 Dec 2012" "ntp (4.2.7p339)" "User Commands" +.TH ntp-keygen 1ntp-keygenman "29 Dec 2012" "ntp (4.2.7p340)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.man) .\" -.\" It has been AutoGen-ed December 26, 2012 at 04:11:51 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:29:52 AM by AutoGen 5.16.2 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc index 7956bd0ff..6ae9ab774 100644 --- a/util/ntp-keygen.1ntp-keygenmdoc +++ b/util/ntp-keygen.1ntp-keygenmdoc @@ -1,9 +1,9 @@ -.Dd December 26 2012 +.Dd December 29 2012 .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 December 26, 2012 at 04:11:58 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed December 29, 2012 at 09:29:58 AM by AutoGen 5.16.2 .\" From the definitions ntp-keygen-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/util/ntp-keygen.html b/util/ntp-keygen.html index be739e062..f272e3c08 100644 --- a/util/ntp-keygen.html +++ b/util/ntp-keygen.html @@ -20,7 +20,7 @@
Ntp-keygen User's Manual
-
+

Short Contents

Top @@ -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.7p339 of ntp-keygen. +
This document applies to version 4.2.7p340 of ntp-keygen.

@@ -906,9 +906,9 @@ By default, the program uses the host key as the sign key. and in the file name for identity files.
Fl
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. - -
+
Fl
Generate parameters and keys for the Mu-Varadharajan (MV) identification scheme. +
Fl: 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. - -
+
Fl: Generate parameters and keys for the Mu-Varadharajan (MV) identification scheme. +

@@ -916,7 +916,7 @@ By default, the program generates a non-trusted certificate.

Random

Random +

Random Seed File All cryptographically sound key generation schemes must have means @@ -930,7 +930,7 @@ program. If a site supports OpenSSL or its companion OpenSSH, it is very likely that means to do this are already available. -

It is important to understand that entropy must be evolved +

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, @@ -938,7 +938,7 @@ 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. -

The entropy seed used by the OpenSSL library is contained in a file, +

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 or the @@ -974,7 +974,7 @@ exits with a suitable error message.

Cryptographic

Cryptographic +

Cryptographic Data Files All other file formats begin with two lines. @@ -990,7 +990,7 @@ Cryptographic values are encoded first using ASN.1 rules, then encrypted if necessary, and finally written PEM-encoded printable ASCII format preceded and followed by MIME content identifier lines. -

The format of the symmetric keys file is somewhat different +

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 is MD5 alphanumeric strings. @@ -1009,9 +1009,10 @@ 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 # +# character. -

Note that the keys used by the +

Note that the keys used by the ntpq(1ntpqmdoc) and ntpdc(1ntpdcmdoc) @@ -1020,7 +1021,7 @@ are checked against passwords requested by the programs and entered by hand, so it is generally appropriate to specify these keys in human readable ASCII format. -

The +

The ntp-keygen program generates a MD5 symmetric keys file ntpkey_MD5key_NsArhostname.filestamp. @@ -1042,11 +1043,11 @@ and ntpdc(1ntpdcmdoc) utilities. -

This section was generated by AutoGen, +

This section was generated by AutoGen, using the agtexi-cmd template and the option descriptions for the ntp-keygen program. This software is released under the NTP license, <http://ntp.org/license>. -

ntp-keygen usage: ntp-keygen help/usage (--help)
ntp-keygen imbits: imbits option (-b)

ntp-keygen certificate: certificate option (-c) @@ -1083,10 +1084,10 @@ Up: Cryptographic

ntp-keygen help/usage (--help)

This is the automatically generated usage text for ntp-keygen. -

The text printed is the same whether selected with the help option +

The text printed is the same whether selected with the help option (--help) or the more-help option (--more-help). more-help will print the usage text by passing it through a pager program. more-help is disabled on platforms without a working @@ -1094,57 +1095,57 @@ 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.7p338
-     USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
-       Flg Arg Option-Name    Description
-        -b Num imbits         identity modulus bits
-                                     - It must be in the range:
-                                       256 to 2048
-        -c Str certificate    certificate scheme
-        -C Str cipher         privatekey cipher
-        -d no  debug-level    Increase debug verbosity level
-                                     - may appear multiple times
-        -D Num set-debug-level Set the debug verbosity level
-                                     - may appear multiple times
-        -e no  id-key         Write IFF or GQ identity keys
-        -G no  gq-params      Generate GQ parameters and keys
-        -H no  host-key       generate RSA host key
-        -I no  iffkey         generate IFF parameters
-        -i Str ident          set Autokey group name
-        -l Num lifetime       set certificate lifetime
-        -M no  md5key         generate MD5 keys
-        -m Num modulus        modulus
-                                     - It must be in the range:
-                                       256 to 2048
-        -P no  pvt-cert       generate PC private certificate
-        -p Str pvt-passwd     output private password
-        -q Str get-pvt-passwd input private password
-        -S Str sign-key       generate sign key (RSA or DSA)
-        -s Str subject-name   set host and optionally group name
-        -T no  trusted-cert   trusted certificate (TC scheme)
-        -V Num mv-params      generate <num> MV parameters
-        -v Num mv-keys        update <num> MV keys
-           opt version        Output version information and exit
-        -? no  help           Display extended usage information and exit
-        -! no  more-help      Extended usage information passed thru pager
-        -> opt save-opts      Save the option state to a config file
-        -< Str load-opts      Load options from a config file
-                                     - disabled as --no-load-opts
-                                     - may appear multiple times
-     
-     Options are specified by doubled hyphens and their name or by a single
-     hyphen and the flag character.
-     
-     
-     
-     The following option preset mechanisms are supported:
-      - reading file $HOME/.ntprc
-      - reading file ./.ntprc
-      - examining environment variables named NTP_KEYGEN_*
-     
-     please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p339
+USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
+  Flg Arg Option-Name    Description
+   -b Num imbits         identity modulus bits
+                                - It must be in the range:
+                                  256 to 2048
+   -c Str certificate    certificate scheme
+   -C Str cipher         privatekey cipher
+   -d no  debug-level    Increase debug verbosity level
+                                - may appear multiple times
+   -D Num set-debug-level Set the debug verbosity level
+                                - may appear multiple times
+   -e no  id-key         Write IFF or GQ identity keys
+   -G no  gq-params      Generate GQ parameters and keys
+   -H no  host-key       generate RSA host key
+   -I no  iffkey         generate IFF parameters
+   -i Str ident          set Autokey group name
+   -l Num lifetime       set certificate lifetime
+   -M no  md5key         generate MD5 keys
+   -m Num modulus        modulus
+                                - It must be in the range:
+                                  256 to 2048
+   -P no  pvt-cert       generate PC private certificate
+   -p Str pvt-passwd     output private password
+   -q Str get-pvt-passwd input private password
+   -S Str sign-key       generate sign key (RSA or DSA)
+   -s Str subject-name   set host and optionally group name
+   -T no  trusted-cert   trusted certificate (TC scheme)
+   -V Num mv-params      generate <num> MV parameters
+   -v Num mv-keys        update <num> MV keys
+      opt version        Output version information and exit
+   -? no  help           Display extended usage information and exit
+   -! no  more-help      Extended usage information passed thru pager
+   -> opt save-opts      Save the option state to a config file
+   -< Str load-opts      Load options from a config file
+                                - disabled as --no-load-opts
+                                - may appear multiple times
+
+Options are specified by doubled hyphens and their name or by a single
+hyphen and the flag character.
+
+
+
+The following option preset mechanisms are supported:
+ - reading file $HOME/.ntprc
+ - reading file ./.ntprc
+ - examining environment variables named NTP_KEYGEN_*
+
+please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 
-       
+  
 

 Next: ntp-keygen certificate,
 Previous: ntp-keygen usage,
@@ -1154,16 +1155,16 @@ Up: Cryptographic
 
 imbits option (-b)
 
-     
+

 This is the “identity modulus bits” option. 
 This option takes an argument number imbits.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       The number of bits in the identity modulus.  The default is 256. 
+  
The number of bits in the identity modulus.  The default is 256. 
 

 

 Next: ntp-keygen cipher,
@@ -1174,20 +1175,20 @@ Up: Cryptographic
 
 certificate option (-c)
 
-     
+

 This is the “certificate scheme” option. 
 This option takes an argument string scheme.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       scheme is one of
+  
scheme is one of
 RSA-MD2, RSA-MD5, RSA-SHA, RSA-SHA1, RSA-MDC2, RSA-RIPEMD160,
 DSA-SHA, or DSA-SHA1.
 
-       
Select the certificate message digest/signature encryption scheme. 
+  
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
 this option is RSA-MD5. 
@@ -1201,16 +1202,16 @@ Up: Cryptographic
 
 
cipher option (-C)
 
-     
+

 This is the “privatekey cipher” option. 
 This option takes an argument string cipher.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       Select the cipher which is used to encrypt the files containing
+  
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 "-C des-ede3-cbc".  The openssl tool lists ciphers
 available in "openssl -h" output. 
@@ -1224,15 +1225,15 @@ Up: Cryptographic
 
 
id-key option (-e)

 
-     
+

 This is the “write iff or gq identity keys” option.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       Write the IFF or GQ client keys to the standard output.  This is
+  
Write the IFF or GQ client keys to the standard output.  This is
 intended for automatic key distribution by mail. 
 

 

@@ -1244,15 +1245,15 @@ Up: Cryptographic
 
 gq-params option (-G)
 
-     
+

 This is the “generate gq parameters and keys” option.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       Generate parameters and keys for the GQ identification scheme,
+  
Generate parameters and keys for the GQ identification scheme,
 obsoleting any that may exist. 
 

 

@@ -1264,15 +1265,15 @@ Up: Cryptographic
 
 host-key option (-H)
 
-     
+

 This is the “generate rsa host key” option.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       Generate new host keys, obsoleting any that may exist. 
+  
Generate new host keys, obsoleting any that may exist. 
 

 

 Next: ntp-keygen ident,
@@ -1283,15 +1284,15 @@ Up: Cryptographic
 
 iffkey option (-I)
 
-     
+

 This is the “generate iff parameters” option.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       Generate parameters for the IFF identification scheme, obsoleting
+  
Generate parameters for the IFF identification scheme, obsoleting
 any that may exist. 
 

 

@@ -1303,23 +1304,23 @@ Up: Cryptographic
 
 ident option (-i)
 
-     
+

 This is the “set autokey group name” option. 
 This option takes an argument string group.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       Set the optional Autokey group name to name.  This is used in
+  
Set the optional Autokey group name to name.  This is used in
 the file name of IFF, GQ, and MV client parameters files.  In
 that role, the default is the host name if this option is not
 provided.  The group name, if specified using -i/--ident or
 using -s/--subject-name following an '}' character,
 is also a part of the self-signed host certificate's subject and
 issuer names in the form host
-       
'crypto ident' or 'server ident' configuration in
+  
'crypto ident' or 'server ident' configuration in
 ntpd's configuration file. 
 

 

@@ -1331,16 +1332,16 @@ Up: Cryptographic
 
 lifetime option (-l)
 
-     
+

 This is the ``set certificate lifetime'' option. 
 This option takes an argument number lifetime.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       Set the certificate expiration to lifetime days from now. 
+  
Set the certificate expiration to lifetime days from now. 
 

 

 Next: ntp-keygen modulus,
@@ -1351,7 +1352,7 @@ Up: Cryptographic
 
 md5key option (-M)
 
-     
+

 This is the ``generate md5 keys'' option. 
 Generate MD5 keys, obsoleting any that may exist. 
 

@@ -1364,16 +1365,16 @@ Up: Cryptographic
 
 modulus option (-m)
 
-     
+

 This is the ``modulus'' option. 
 This option takes an argument number modulus.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       The number of bits in the prime modulus.  The default is 512. 
+  
The number of bits in the prime modulus.  The default is 512. 
 

 

 Next: ntp-keygen pvt-passwd,
@@ -1384,15 +1385,15 @@ Up: Cryptographic
 
 pvt-cert option (-P)
 
-     
+

 This is the ``generate pc private certificate'' option.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       Generate a private certificate.  By default, the program generates
+  
Generate a private certificate.  By default, the program generates
 public certificates. 
 

 

@@ -1404,16 +1405,16 @@ Up: Cryptographic
 
 pvt-passwd option (-p)
 
-     
+

 This is the ``output private password'' option. 
 This option takes an argument string passwd.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       Encrypt generated files containing private data with the specified
+  
Encrypt generated files containing private data with the specified
 password and the cipher selected with -C/--cipher. 
 

 

@@ -1425,16 +1426,16 @@ Up: Cryptographic
 
 get-pvt-passwd option (-q)
 
-     
+

 This is the ``input private password'' option. 
 This option takes an argument string passwd.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       Set the password for reading files to the specified password. 
+  
Set the password for reading files to the specified password. 
 

 

 Next: ntp-keygen subject-name,
@@ -1445,16 +1446,16 @@ Up: Cryptographic
 
 sign-key option (-S)
 
-     
+

 This is the ``generate sign key (rsa or dsa)'' option. 
 This option takes an argument string sign.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       Generate a new sign key of the designated type, obsoleting any
+  
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. 
 

@@ -1467,23 +1468,23 @@ Up: Cryptographic
 
 subject-name option (-s)
 
-     
+

 This is the ``set host and optionally group name'' option. 
 This option takes an argument string host@group.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       Set the Autokey host name, and optionally, group name specified
+  
Set the Autokey host name, and optionally, group name specified
 following an '}' character.  The host name is used in the file
 name of generated host and signing certificates, without the
 group name.  The host name, and if provided, group name are used
 in host
-       
fields.  Specifying '-s
-       
leaving the host name unchanged while appending
-       
subject and issuer fields, as with -i group.  The group name, or
+  
fields.  Specifying '-s
+  
leaving the host name unchanged while appending
+  
subject and issuer fields, as with -i group.  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. 
 

@@ -1496,15 +1497,15 @@ Up: Cryptographic
 
 trusted-cert option (-T)
 
-     
+

 This is the ``trusted certificate (tc scheme)'' option.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       Generate a trusted certificate.  By default, the program generates
+  
Generate a trusted certificate.  By default, the program generates
 a non-trusted certificate. 
 

 

@@ -1516,16 +1517,16 @@ Up: Cryptographic
 
 mv-params option (-V)
 
-     
+

 This is the ``generate <num> mv parameters'' option. 
 This option takes an argument number num.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       Generate parameters and keys for the Mu-Varadharajan (MV)
+  
Generate parameters and keys for the Mu-Varadharajan (MV)
 identification scheme. 
 

 

@@ -1537,16 +1538,16 @@ Up: Cryptographic
 
 mv-keys option (-v)
 
-     
+

 This is the ``update <num> mv keys'' option. 
 This option takes an argument number num.
 
-     
This option has some usage constraints.  It:
-          

+This option has some usage constraints.  It:
+     

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-       This option has no doc documentation.
+  
This option has no doc documentation.
 
 

 

@@ -1558,63 +1559,63 @@ Up: Cryptographic
 
 presetting/configuring ntp-keygen
 
-     Any option that is not marked as not presettable may be preset by
+
Any option that is not marked as not presettable may be preset by
 loading values from configuration ("rc" or "ini") files, and values from environment variables named NTP-KEYGEN and NTP-KEYGEN_<OPTION_NAME>.  <OPTION_NAME> must be one of
 the options listed above in upper case and segmented with underscores. 
 The NTP-KEYGEN variable will be tokenized and parsed like
 the command line.  The remaining variables are tested for existence and their
 values are treated like option arguments.
 
-     
libopts will search in 2 places for configuration files:
-          

+libopts will search in 2 places for configuration files:
+     

 $HOME
 
$PWD
 
-       The environment variables HOME, and PWD
+  The environment variables HOME, and PWD
 are expanded and replaced when ntp-keygen runs. 
 For any of these that are plain files, they are simply processed. 
 For any that are directories, then a file named .ntprc is searched for
 within that directory and processed.
 
-       Configuration files may be in a wide variety of formats. 
+  
Configuration files may be in a wide variety of formats. 
 The basic format is an option name followed by a value (argument) on the
 same line.  Values may be separated from the option name with a colon,
 equal sign or simply white space.  Values may be continued across multiple
 lines by escaping the newline with a backslash.
 
-       
Multiple programs may also share the same initialization file. 
+  
Multiple programs may also share the same initialization file. 
 Common options are collected at the top, followed by program specific
 segments.  The segments are separated by lines like:
-     
         [NTP-KEYGEN]
-    
-       or by
-     
         <?program ntp-keygen>
-    
-       Do not mix these styles within one configuration file.
-
-       
Compound values and carefully constructed string values may also be
+
    [NTP-KEYGEN]
+
+  or by
+
    <?program ntp-keygen>
+
+  Do not mix these styles within one configuration file.
+
+  
Compound values and carefully constructed string values may also be
 specified using XML syntax:
-     
         <option-name>
-            <sub-opt>...&lt;...&gt;...</sub-opt>
-         </option-name>
-    
-       yielding an option-name.sub-opt string value of
-     
         "...<...>..."
-    
-       AutoOpts does not track suboptions.  You simply note that it is a
+
    <option-name>
+       <sub-opt>...&lt;...&gt;...</sub-opt>
+    </option-name>
+
+  yielding an option-name.sub-opt string value of
+
    "...<...>..."
+
+  AutoOpts does not track suboptions.  You simply note that it is a
 hierarchicly valued option.  AutoOpts does provide a means for searching
 the associated name/value pair list (see: optionFindValue).
 
-       
The command line options relating to configuration and/or usage help are:
+  
The command line options relating to configuration and/or usage help are:
 
 
version (-)
 
-     Print the program version to standard out, optionally with licensing
+
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:
 
-          

+     
 version
Only print the version.  This is the default. 
 
copyright
Name the copyright usage licensing terms. 
 
verbose
Print the full copyright usage licensing terms. 
@@ -1630,15 +1631,15 @@ Up: Cryptographic
 
 ntp-keygen exit status
 
-     One of the following exit values will be returned:
-          

+One of the following exit values will be returned:
+     

 0 (EXIT_SUCCESS)
Successful program execution. 
 
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
 
66 (EX_NOINPUT)
A specified configuration file could not be loaded. 
 
70 (EX_SOFTWARE)
libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you. 
 
-       
+  
 

 Next: ntp-keygen Notes,
 Previous: ntp-keygen exit status,
@@ -1648,7 +1649,7 @@ Up: Cryptographic
 
 ntp-keygen Usage
 
-     The
+
The
 -p -password option specifies the write password and
 -q -password option the read password for previously encrypted files. 
 The
@@ -1668,7 +1669,7 @@ Up: Cryptographic
 
 
ntp-keygen Notes
 
-     This document corresponds to version  of NTP. 
+
This document corresponds to version  of NTP. 
 Portions of this document came from FreeBSD. 
 

 

@@ -1679,12 +1680,12 @@ Up: Cryptographic
 
 ntp-keygen Bugs
 
-     It can take quite a while to generate some cryptographic values,
+
It can take quite a while to generate some cryptographic values,
 from one to several minutes with modern architectures
 such as UltraSPARC and up to tens of minutes to an hour
 with older architectures such as SPARC IPC.
 
-       
Please report bugs to http://bugs.ntp.org .
+  
Please report bugs to http://bugs.ntp.org .
 
 

 

@@ -1694,10 +1695,10 @@ Up: Top
 

 
 
-     
+
 Random Seed File
 
-     All cryptographically sound key generation schemes must have means to
+
All cryptographically sound key generation schemes must have means to
 randomize the entropy seed used to initialize the internal
 pseudo-random number generator used by the OpenSSL library routines. 
 If a site supports ssh, it is very likely that means to do this are
@@ -1706,7 +1707,7 @@ The entropy seed used by the OpenSSL library is contained in a file,
 usually called .rnd, which must be available when
 starting the ntp-keygen program or ntpd daemon.
 
-       
The OpenSSL library looks for the file using the path specified by the
+  
The OpenSSL library looks for the file using the path specified by the
 RANDFILE environment variable in the user home directory, whether root
 or some other user. 
 If the RANDFILE environment variable is not
@@ -1725,10 +1726,10 @@ Up: Top
 

 
 
-     
+
 Cryptographic Data Files
 
-     File and link names are in the form ntpkey_key_name.fstamp,
+
File and link names are in the form ntpkey_key_name.fstamp,
 where key is the key or parameter type,
 name is the host or group name and
 fstamp is the filestamp (NTP seconds) when the file was created). 
@@ -1737,7 +1738,7 @@ lower case characters, while key names in generated link names include
 only lower case characters. The filestamp is not used in generated link
 names.
 
-       
The key name is a string defining the cryptographic key type. 
+  
The key name is a string defining the cryptographic key type. 
 Key types include public/private keys host and sign, certificate cert
 and several challenge/response key types. 
 By convention, client files used for
@@ -1745,49 +1746,49 @@ challenges have a par subtype, as in the IFF challenge IFFpar, while
 server files for responses have a key subtype, as in the GQ response
 GQkey.
 
-       
All files begin with two nonencrypted lines. The first line contains
+  
All files begin with two nonencrypted lines. The first line contains
 the file name in the format ntpkey_key_host.fstamp. 
 The second line contains the datestamp in conventional Unix date format. 
 Lines beginning with # are ignored.
 
-       
The remainder of the file contains cryptographic data encoded first
+  
The remainder of the file contains cryptographic data encoded first
 using ASN.1 rules, then encrypted using the DES-CBC algorithm with
 given password and finally written in PEM-encoded printable ASCII text
 preceded and followed by MIME content identifier lines.
 
-       
The format of the symmetric keys file, ordinarily named ntp.keys,
+  
The format of the symmetric keys file, ordinarily named ntp.keys,
 is somewhat different than the other files in the interest of backward
 compatibility. 
 Ordinarily, the file is generated by this program, but
 it can be constructed and edited using an ordinary text editor.
 
-     
         # ntpkey_MD5key_hms.local.3564038757
-         # Sun Dec  9 02:45:57 2012
-         
-          1 MD5 "]!ghT%O;3)WJ,/Nc:>I  # MD5 key
-          2 MD5 lu+H^tF46BKR-6~pV_5  # MD5 key
-          3 MD5 :lnoVsE%Yz*avh%EtNC  # MD5 key
-          4 MD5 |fdZrf0sF~^V  # MD5 key
-          5 MD5 IyAG>O"y"LmCRS!*bHC  # MD5 key
-          6 MD5 ">e\A  # MD5 key
-          7 MD5 c9x=M'CfLxax9v)PV-si  # MD5 key
-          8 MD5 E|=jvFVov?Bn|Ev=&aK\  # MD5 key
-          9 MD5 T!c4UT&`(m$+m+B6,`Q0  # MD5 key
-         10 MD5 JVF/1=)=IFbHbJQz..Cd  # MD5 key
-         11 SHA1 6dea311109529e436c2b4fccae9bc753c16d1b48  # SHA1 key
-         12 SHA1 7076f373d86c4848c59ff8046e49cb7d614ec394  # SHA1 key
-         13 SHA1 5f48b1b60591eb01b7cf1d33b7774f08d20262d3  # SHA1 key
-         14 SHA1 eed5ab9d9497319ec60cf3781d52607e76720178  # SHA1 key
-         15 SHA1 f283562611a04c964da8126296f5f8e58c3f85de  # SHA1 key
-         16 SHA1 1930da171297dd63549af50b29449de17dcf341f  # SHA1 key
-         17 SHA1 fee892110358cd4382322b889869e750db8e8a8f  # SHA1 key
-         18 SHA1 b5520c9fadd7ad3fd8bfa061c8821b65d029bb37  # SHA1 key
-         19 SHA1 8c74fb440ec80f453ec6aaa62b9baed0ab723b92  # SHA1 key
-         20 SHA1 6bc05f734306a189326000970c19b3910f403795  # SHA1 key
-    
-       Figure 1. Typical Symmetric Key File
-
-       
Figure 1 shows a typical symmetric keys file used by the reference
+
    # ntpkey_MD5key_hms.local.3564038757
+    # Sun Dec  9 02:45:57 2012
+    
+     1 MD5 "]!ghT%O;3)WJ,/Nc:>I  # MD5 key
+     2 MD5 lu+H^tF46BKR-6~pV_5  # MD5 key
+     3 MD5 :lnoVsE%Yz*avh%EtNC  # MD5 key
+     4 MD5 |fdZrf0sF~^V  # MD5 key
+     5 MD5 IyAG>O"y"LmCRS!*bHC  # MD5 key
+     6 MD5 ">e\A  # MD5 key
+     7 MD5 c9x=M'CfLxax9v)PV-si  # MD5 key
+     8 MD5 E|=jvFVov?Bn|Ev=&aK\  # MD5 key
+     9 MD5 T!c4UT&`(m$+m+B6,`Q0  # MD5 key
+    10 MD5 JVF/1=)=IFbHbJQz..Cd  # MD5 key
+    11 SHA1 6dea311109529e436c2b4fccae9bc753c16d1b48  # SHA1 key
+    12 SHA1 7076f373d86c4848c59ff8046e49cb7d614ec394  # SHA1 key
+    13 SHA1 5f48b1b60591eb01b7cf1d33b7774f08d20262d3  # SHA1 key
+    14 SHA1 eed5ab9d9497319ec60cf3781d52607e76720178  # SHA1 key
+    15 SHA1 f283562611a04c964da8126296f5f8e58c3f85de  # SHA1 key
+    16 SHA1 1930da171297dd63549af50b29449de17dcf341f  # SHA1 key
+    17 SHA1 fee892110358cd4382322b889869e750db8e8a8f  # SHA1 key
+    18 SHA1 b5520c9fadd7ad3fd8bfa061c8821b65d029bb37  # SHA1 key
+    19 SHA1 8c74fb440ec80f453ec6aaa62b9baed0ab723b92  # SHA1 key
+    20 SHA1 6bc05f734306a189326000970c19b3910f403795  # SHA1 key
+
+  Figure 1. Typical Symmetric Key File
+
+  
Figure 1 shows a typical symmetric keys file used by the reference
 implementation. 
 Each line of the file contains three fields, first an
 integer between 1 and 65534, inclusive, representing the key identifier
@@ -1803,19 +1804,19 @@ compatibility with FIPS 140-2 is required, the key type must be either
 SHA or SHA1. 
 The key type can be changed using an ASCII text editor.
 
-       
An MD5 key consists of a printable ASCII string less than or equal to
+  
An MD5 key consists of a printable ASCII string less than or equal to
 16 characters and terminated by whitespace or a # character. 
 An OpenSSL
 key consists of a hex-encoded ASCII string of 40 characters, which is
 truncated as necessary.
 
-       
Note that the keys used by the ntpq and ntpdc programs are
+  
Note that the keys used by the ntpq and ntpdc programs are
 checked against passwords requested by the programs and entered by hand,
 so it
 is generally appropriate to specify these keys in human readable ASCII
 format.
 
-       
The ntp-keygen program generates a MD5 symmetric keys file
+  
The ntp-keygen program generates a MD5 symmetric keys file
 ntpkey_MD5key_hostname.filestamp. 
 Since the file contains private
 shared keys, it should be visible only to root and distributed by
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index a3b9b7e8b..c54be07b3 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "26 Dec 2012" "ntp (4.2.7p339)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "29 Dec 2012" "ntp (4.2.7p340)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  December 26, 2012 at 04:11:51 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 29, 2012 at 09:29:52 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index d039bd38a..18f7eaf8a 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 26 2012
+.Dd December 29 2012
 .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  December 26, 2012 at 04:11:58 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  December 29, 2012 at 09:29:58 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME

Auxiliary

Authentication

Symmetric-Key

Public

Naming

Operation

Key

Authentication

Error

Monitoring

Monitoring

Access

The

Access

Automatic

Manycasting

Manycast

Manycast

Reference

Reference

Miscellaneous

Short Contents

ntpd See Also

ntpd Bugs

ntpd Notes

Usage

Short Contents

Ntp-keygen User's Manual

Short Contents

Random

Cryptographic

ntp-keygen help/usage (--help)

imbits option (-b)

certificate option (-c)

cipher option (-C)

id-key option (-e)

gq-params option (-G)

host-key option (-H)

iffkey option (-I)

ident option (-i)

lifetime option (-l)

md5key option (-M)

modulus option (-m)

pvt-cert option (-P)

pvt-passwd option (-p)

get-pvt-passwd option (-q)

sign-key option (-S)

subject-name option (-s)

trusted-cert option (-T)

mv-params option (-V)

mv-keys option (-v)

presetting/configuring ntp-keygen

version (-)

ntp-keygen exit status

ntp-keygen Usage

ntp-keygen Notes

ntp-keygen Bugs

Random Seed File

Cryptographic Data Files

`id-key option (-e)`