From: NTP Release Engineering Date: Fri, 7 Jun 2019 07:59:59 +0000 (-0700) Subject: NTP_4_3_98 X-Git-Tag: NTP_4_3_98^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70909008e9b486d1e08a5b9266158b0d0cc1d7cc;p=thirdparty%2Fntp.git NTP_4_3_98 bk: 5cfa197f8tkSY8HnzDvb3t742hSobA --- diff --git a/ChangeLog b/ChangeLog index 4318fe791..b1dd573ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.3.98) 2019/06/07 Released by Harlan Stenn From ntp-4.2.8p12: --- (4.2.8p12) 2018/08/14 Released by Harlan Stenn diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index d559311f7..ee0201a63 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 June 6, 2019 at 11:18:54 PM by AutoGen 5.18.5 +# It has been AutoGen-ed June 7, 2019 at 12:45:24 AM by AutoGen 5.18.5 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -284,7 +284,7 @@ option. All packets sent to and received from the server or peer are to include authentication fields encrypted using the specified @kbd{key} -identifier with values from 1 to 65534, inclusive. +identifier with values from 1 to 65535, inclusive. The default is to include no encryption field. @item @code{minpoll} @kbd{minpoll} @@ -543,7 +543,7 @@ and reports at the NTP project page linked from @code{http://www.ntp.org/}. @subsubsection 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 +65,535 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 @@ -827,7 +827,7 @@ The @kbd{key} argument is the key identifier for a trusted key, where the value can be in the -range 1 to 65,534, inclusive. +range 1 to 65,535, inclusive. @item @code{crypto} @code{[@code{cert} @kbd{file}]} @code{[@code{leap} @kbd{file}]} @code{[@code{randfile} @kbd{file}]} @code{[@code{host} @kbd{file}]} @code{[@code{sign} @kbd{file}]} @code{[@code{gq} @kbd{file}]} @code{[@code{gqpar} @kbd{file}]} @code{[@code{iffpar} @kbd{file}]} @code{[@code{mvpar} @kbd{file}]} @code{[@code{pw} @kbd{password}]} This command requires the OpenSSL library. It activates public key @@ -920,7 +920,7 @@ The @kbd{key} argument is a key identifier for the trusted key, where the value can be in the range 1 to -65,534, inclusive. +65,535, inclusive. @item @code{revoke} @kbd{logsec} Specifies the interval between re-randomization of certain cryptographic values used by the Autokey scheme, as a power of 2 in @@ -947,7 +947,7 @@ servers. The @kbd{key} arguments are 32-bit unsigned -integers with values from 1 to 65,534. +integers with values from 1 to 65,535. @end table @subsubsection Error Codes The following error codes are reported via the NTP control diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index c42ca6992..26fc88568 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 June 6, 2019 at 11:18:56 PM by AutoGen 5.18.5 +# It has been AutoGen-ed June 7, 2019 at 12:45:25 AM by AutoGen 5.18.5 # From the definitions ntp.keys.def # and the template file agtexi-file.tpl @end ignore @@ -29,7 +29,7 @@ statement in the configuration file. While key number 0 is fixed by the NTP standard (as 56 zero bits) and may not be changed, -one or more keys numbered between 1 and 65534 +one or more keys numbered between 1 and 65535 may be arbitrarily set in the keys file. The key file uses the same comment conventions @@ -42,7 +42,7 @@ Key entries use a fixed format of the form where @kbd{keyno} -is a positive integer (between 1 and 65534), +is a positive integer (between 1 and 65535), @kbd{type} is the message digest algorithm, @kbd{key} diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index dc59405b8..687e8ce45 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 June 6, 2019 at 11:18:57 PM by AutoGen 5.18.5 +# It has been AutoGen-ed June 7, 2019 at 12:45:26 AM by AutoGen 5.18.5 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -142,7 +142,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.3.97 +ntpd - NTP daemon program - Ver. 4.3.98 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 101ba10a3..f991e4292 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5man "06 Jun 2019" "4.3.97" "File Formats" +.TH ntp.conf 5man "07 Jun 2019" "4.3.98" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed June 6, 2019 at 11:18:58 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 7, 2019 at 12:45:28 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -326,7 +326,7 @@ option. All packets sent to and received from the server or peer are to include authentication fields encrypted using the specified \f\*[I-Font]key\f[] -identifier with values from 1 to 65534, inclusive. +identifier with values from 1 to 65535, inclusive. The default is to include no encryption field. .TP 7 @@ -611,7 +611,7 @@ and reports at the NTP project page linked from \f[C]http://www.ntp.org/\f[]. .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 +65,535 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 @@ -932,7 +932,7 @@ The \f\*[I-Font]key\f[] argument is the key identifier for a trusted key, where the value can be in the -range 1 to 65,534, inclusive. +range 1 to 65,535, inclusive. .TP 7 .NOP \f\*[B-Font]crypto\f[] [\f\*[B-Font]cert\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]leap\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]randfile\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]host\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]sign\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]gq\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]gqpar\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]iffpar\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]mvpar\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]pw\f[] \f\*[I-Font]password\f[]] This command requires the OpenSSL library. @@ -1038,7 +1038,7 @@ The \f\*[I-Font]key\f[] argument is a key identifier for the trusted key, where the value can be in the range 1 to -65,534, inclusive. +65,535, inclusive. .TP 7 .NOP \f\*[B-Font]revoke\f[] \f\*[I-Font]logsec\f[] Specifies the interval between re-randomization of certain @@ -1067,7 +1067,7 @@ servers. The \f\*[I-Font]key\f[] arguments are 32-bit unsigned -integers with values from 1 to 65,534. +integers with values from 1 to 65,535. .PP .SS Error Codes The following error codes are reported via the NTP control diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index eba3610b1..33f08833f 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd June 6 2019 +.Dd June 7 2019 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 6, 2019 at 11:18:49 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 7, 2019 at 12:45:18 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -325,7 +325,7 @@ option. All packets sent to and received from the server or peer are to include authentication fields encrypted using the specified .Ar key -identifier with values from 1 to 65534, inclusive. +identifier with values from 1 to 65535, inclusive. The default is to include no encryption field. .It Cm minpoll Ar minpoll @@ -583,7 +583,7 @@ 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 +65,535 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 @@ -877,7 +877,7 @@ The .Ar key argument is the key identifier for a trusted key, where the value can be in the -range 1 to 65,534, inclusive. +range 1 to 65,535, inclusive. .It Xo Ic crypto .Op Cm cert Ar file .Op Cm leap Ar file @@ -981,7 +981,7 @@ The .Ar key argument is a key identifier for the trusted key, where the value can be in the range 1 to -65,534, inclusive. +65,535, inclusive. .It Ic revoke Ar logsec Specifies the interval between re\-randomization of certain cryptographic values used by the Autokey scheme, as a power of 2 in @@ -1008,7 +1008,7 @@ servers. The .Ar key arguments are 32\-bit unsigned -integers with values from 1 to 65,534. +integers with values from 1 to 65,535. .El .Ss Error Codes The following error codes are reported via the NTP control diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index 4ed793666..e03f47d3b 100644 --- a/ntpd/ntp.conf.html +++ b/ntpd/ntp.conf.html @@ -61,7 +61,7 @@ Next:

Short Table of Contents

@@ -1690,7 +1690,7 @@ The subcommand specifies the probability of discard for packets that overflow the rate-control window.

-
restrict address [mask mask] [flag ...]
+
restrict address [mask mask] [ippeerlimit int] [flag ...]

The address argument expressed in @@ -1714,6 +1714,15 @@ Note that text string default, with no mask option, may be used to indicate the default entry. +The +ippeerlimit +directive limits the number of peer requests for each IP to +int, +where a value of -1 means "unlimited", the current default. +A value of 0 means "none". +There would usually be at most 1 peering request per IP, +but if the remote peering requests are behind a proxy +there could well be more than 1 per IP. In the current implementation, flag always @@ -1768,6 +1777,19 @@ This flag modifies the assignment algorithm by allowing low priority traps to be overridden by later requests for normal priority traps.

+
noepeer
+

Deny ephemeral peer requests, +even if they come from an authenticated source. +Note that the ability to use a symmetric key for authentication may be restricted to +one or more IPs or subnets via the third field of the +ntp.keys +file. +This restriction is not enabled by default, +to maintain backward compatability. +Expect +noepeer +to become the default in ntp-4.4. +

nomodify

Deny ntpq(1ntpqmdoc) @@ -1787,10 +1809,10 @@ queries. Time service is not affected.

nopeer
-

Deny packets which would result in mobilizing a new association. -This -includes broadcast and symmetric active packets when a configured -association does not exist. +

Deny unauthenticated packets which would result in mobilizing a new association. +This includes +broadcast and symmetric active packets +when a configured association does not exist. It also includes pool associations, so if you want to use servers from a @@ -1798,10 +1820,10 @@ associations, so if you want to use servers from a directive and also want to use nopeer by default, you’ll want a -restrict source ... line as well that does -

-
not
-

include the +restrict source ... +line as well that does +not +include the nopeer directive.

@@ -2188,7 +2210,7 @@ there is clear benefit to having the clients notice this change as soon as possible. Attacks such as replay attacks can happen, however, and even though there are a number of protections built in to -broadcast mode, attempts to perform a replay attack are possible. +broadcast mode, attempts to perform a replay attack are possible. This value defaults to 0, but can be changed to any number of poll intervals between 0 and 4.

@@ -2528,7 +2550,7 @@ specific drivers in the page (available as part of the HTML documentation provided in -/usr/share/doc/ntp). +/usr/share/doc/ntp ).

stratum int

Specifies the stratum number assigned to the driver, an integer @@ -2819,6 +2841,71 @@ This option is useful for sites that run on multiple hosts, with (mostly) common options (e.g., a restriction list).

+
interface [listen | ignore | drop] [all | ipv4 | ipv6 | wildcard name | address [/ prefixlen]]
+

The +interface +directive controls which network addresses +ntpd(1ntpdmdoc) +opens, and whether input is dropped without processing. +The first parameter determines the action for addresses +which match the second parameter. +The second parameter specifies a class of addresses, +or a specific interface name, +or an address. +In the address case, +prefixlen +determines how many bits must match for this rule to apply. +ignore +prevents opening matching addresses, +drop +causes +ntpd(1ntpdmdoc) +to open the address and drop all received packets without examination. +Multiple +interface +directives can be used. +The last rule which matches a particular address determines the action for it. +interface +directives are disabled if any +-I, +--interface, +-L, +or +--novirtualips +command-line options are specified in the configuration file, +all available network addresses are opened. +The +nic +directive is an alias for +interface. +

+
leapfile leapfile
+

This command loads the IERS leapseconds file and initializes the +leapsecond values for the next leapsecond event, leapfile expiration +time, and TAI offset. +The file can be obtained directly from the IERS at +https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list +or +ftp://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list. +The +leapfile +is scanned when +ntpd(1ntpdmdoc) +processes the +leapfile directive or when +ntpd detects that the +leapfile +has changed. +ntpd +checks once a day to see if the +leapfile +has changed. +The +update-leap(1update_leapmdoc) +script can be run to see if the +leapfile +should be updated. +

leapsmearinterval seconds

This EXPERIMENTAL option is only available if ntpd(1ntpdmdoc) @@ -2908,6 +2995,161 @@ This is the same operation as the -l command line option.

+
mru [maxdepth count | maxmem kilobytes | mindepth count | maxage seconds | initialloc count | initmem kilobytes | incalloc count | incmem kilobytes]
+

Controls size limite of the monitoring facility’s Most Recently Used +(MRU) list +of client addresses, which is also used by the +rate control facility. +

+
maxdepth count
+
maxmem kilobytes
+

Equivalent upper limits on the size of the MRU list, in terms of entries or kilobytes. +The acutal limit will be up to +incalloc +entries or +incmem +kilobytes larger. +As with all of the +mru +options offered in units of entries or kilobytes, if both +maxdepth +and +maxmem are used, the last one used controls. +The default is 1024 kilobytes. +

+
mindepth count
+

Lower limit on the MRU list size. +When the MRU list has fewer than +mindepth +entries, existing entries are never removed to make room for newer ones, +regardless of their age. +The default is 600 entries. +

+
maxage seconds
+

Once the MRU list has +mindepth +entries and an additional client is to ba added to the list, +if the oldest entry was updated more than +maxage +seconds ago, that entry is removed and its storage is reused. +If the oldest entry was updated more recently the MRU list is grown, +subject to +maxdepth / moxmem. +The default is 64 seconds. +

+
initalloc count
+
initmem kilobytes
+

Initial memory allocation at the time the monitoringfacility is first enabled, +in terms of the number of entries or kilobytes. +The default is 4 kilobytes. +

+
incalloc count
+
incmem kilobytes
+

Size of additional memory allocations when growing the MRU list, in entries or kilobytes. +The default is 4 kilobytes. +

+
+
+
nonvolatile threshold
+

Specify the +threshold +delta in seconds before an hourly change to the +driftfile +(frequency file) will be written, with a default value of 1e-7 (0.1 PPM). +The frequency file is inspected each hour. +If the difference between the current frequency and the last value written +exceeds the threshold, the file is written and the +threshold +becomes the new threshold value. +If the threshold is not exceeeded, it is reduced by half. +This is intended to reduce the number of file writes +for embedded systems with nonvolatile memory. +

+
phone dial ...
+

This command is used in conjunction with +the ACTS modem driver (type 18) +or the JJY driver (type 40, mode 100 - 180). +For the ACTS modem driver (type 18), the arguments consist of +a maximum of 10 telephone numbers used to dial USNO, NIST, or European +time service. +For the JJY driver (type 40 mode 100 - 180), the argument is +one telephone number used to dial the telephone JJY service. +The Hayes command ATDT is normally prepended to the number. +The number can contain other modem control codes as well. +

+
reset [allpeers] [auth] [ctl] [io] [mem] [sys] [timer]
+

Reset one or more groups of counters maintained by +ntpd +and exposed by +ntpq +and +ntpdc. +

+
rlimit [memlock Nmegabytes | stacksize N4kPages filenum Nfiledescriptors]
+
+
memlock Nmegabytes
+

Specify the number of megabytes of memory that should be +allocated and locked. +Probably only available under Linux, this option may be useful +when dropping root (the +-i +option). +The default is 32 megabytes on non-Linux machines, and -1 under Linux. +-1 means "do not lock the process into memory". +0 means "lock whatever memory the process wants into memory". +

+
stacksize N4kPages
+

Specifies the maximum size of the process stack on systems with the +mlockall() +function. +Defaults to 50 4k pages (200 4k pages in OpenBSD). +

+
filenum Nfiledescriptors
+

Specifies the maximum number of file descriptors ntpd may have open at once. +Defaults to the system default. +

+
+
+
saveconfigdir directory_path
+

Specify the directory in which to write configuration snapshots +requested with +.Cm ntpq ’s +saveconfig +command. +If +saveconfigdir +does not appear in the configuration file, +saveconfig +requests are rejected by +ntpd. +

+
saveconfig filename
+

Write the current configuration, including any runtime +modifications given with +:config +or +config-from-file +to the +ntpd +host’s +filename +in the +saveconfigdir. +This command will be rejected unless the +saveconfigdir +directive appears in +.Cm ntpd ’s +configuration file. +filename +can use +strftime(3) +format directives to substitute the current date and time, +for example, +saveconfig\ ntp-%Y%m%d-%H%M%S.conf. +The filename used is stored in the system variable +savedconfig. +Authentication is required. +

setvar variable [default]

This command adds an additional system variable. These @@ -2941,6 +3183,12 @@ the names of all peer variables and the clock_var_list holds the names of the reference clock variables.

+
sysinfo
+

Display operational summary. +

+
sysstats
+

Show statistics counters maintained in the protocol module. +

tinker [allan allan | dispersion dispersion | freq freq | huffpuff huffpuff | panic panic | step step | stepback stepback | stepfwd stepfwd | stepout stepout]

This command can be used to alter several system variables in very exceptional circumstances. @@ -3028,31 +3276,19 @@ pulses will not be suppressed.

-
rlimit [memlock Nmegabytes | stacksize N4kPages filenum Nfiledescriptors]
-
-
memlock Nmegabytes
-

Specify the number of megabytes of memory that should be -allocated and locked. -Probably only available under Linux, this option may be useful -when dropping root (the --i -option). -The default is 32 megabytes on non-Linux machines, and -1 under Linux. --1 means "do not lock the process into memory". -0 means "lock whatever memory the process wants into memory". -

-
stacksize N4kPages
-

Specifies the maximum size of the process stack on systems with the -mlockall() -function. -Defaults to 50 4k pages (200 4k pages in OpenBSD). -

-
filenum Nfiledescriptors
-

Specifies the maximum number of file descriptors ntpd may have open at once. -Defaults to the system default. +

writevar assocID\ name = value [,...]
+

Write (create or update) the specified variables. +If the +assocID +is zero, the variablea re from the +system variables +name space, otherwise they are from the +peer variables +name space. +The +assocID +is required, as the same name can occur in both name spaces.

-
-
trap 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 @@ -3064,6 +3300,14 @@ 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. +

+
ttl 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.

The trap receiver will generally log event messages and other information from the server in a log file. diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index d49bcf27f..a5611f256 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5 "06 Jun 2019" "4.3.97" "File Formats" +.TH ntp.conf 5 "07 Jun 2019" "4.3.98" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed June 6, 2019 at 11:18:58 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 7, 2019 at 12:45:28 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -326,7 +326,7 @@ option. All packets sent to and received from the server or peer are to include authentication fields encrypted using the specified \f\*[I-Font]key\f[] -identifier with values from 1 to 65534, inclusive. +identifier with values from 1 to 65535, inclusive. The default is to include no encryption field. .TP 7 @@ -611,7 +611,7 @@ and reports at the NTP project page linked from \f[C]http://www.ntp.org/\f[]. .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 +65,535 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 @@ -932,7 +932,7 @@ The \f\*[I-Font]key\f[] argument is the key identifier for a trusted key, where the value can be in the -range 1 to 65,534, inclusive. +range 1 to 65,535, inclusive. .TP 7 .NOP \f\*[B-Font]crypto\f[] [\f\*[B-Font]cert\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]leap\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]randfile\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]host\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]sign\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]gq\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]gqpar\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]iffpar\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]mvpar\f[] \f\*[I-Font]file\f[]] [\f\*[B-Font]pw\f[] \f\*[I-Font]password\f[]] This command requires the OpenSSL library. @@ -1038,7 +1038,7 @@ The \f\*[I-Font]key\f[] argument is a key identifier for the trusted key, where the value can be in the range 1 to -65,534, inclusive. +65,535, inclusive. .TP 7 .NOP \f\*[B-Font]revoke\f[] \f\*[I-Font]logsec\f[] Specifies the interval between re-randomization of certain @@ -1067,7 +1067,7 @@ servers. The \f\*[I-Font]key\f[] arguments are 32-bit unsigned -integers with values from 1 to 65,534. +integers with values from 1 to 65,535. .PP .SS Error Codes The following error codes are reported via the NTP control diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 09f97fbcd..414c536c9 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd June 6 2019 +.Dd June 7 2019 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 6, 2019 at 11:18:49 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 7, 2019 at 12:45:18 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -325,7 +325,7 @@ option. All packets sent to and received from the server or peer are to include authentication fields encrypted using the specified .Ar key -identifier with values from 1 to 65534, inclusive. +identifier with values from 1 to 65535, inclusive. The default is to include no encryption field. .It Cm minpoll Ar minpoll @@ -583,7 +583,7 @@ 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 +65,535 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 @@ -877,7 +877,7 @@ The .Ar key argument is the key identifier for a trusted key, where the value can be in the -range 1 to 65,534, inclusive. +range 1 to 65,535, inclusive. .It Xo Ic crypto .Op Cm cert Ar file .Op Cm leap Ar file @@ -981,7 +981,7 @@ The .Ar key argument is a key identifier for the trusted key, where the value can be in the range 1 to -65,534, inclusive. +65,535, inclusive. .It Ic revoke Ar logsec Specifies the interval between re\-randomization of certain cryptographic values used by the Autokey scheme, as a power of 2 in @@ -1008,7 +1008,7 @@ servers. The .Ar key arguments are 32\-bit unsigned -integers with values from 1 to 65,534. +integers with values from 1 to 65,535. .El .Ss Error Codes The following error codes are reported via the NTP control diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index 89b70eb56..c3c95870d 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "06 Jun 2019" "4.3.97" "File Formats" +.TH ntp.keys 5man "07 Jun 2019" "4.3.98" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed June 6, 2019 at 11:18:59 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 7, 2019 at 12:45:29 AM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME @@ -54,7 +54,7 @@ statement in the configuration file. While key number 0 is fixed by the NTP standard (as 56 zero bits) and may not be changed, -one or more keys numbered between 1 and 65534 +one or more keys numbered between 1 and 65535 may be arbitrarily set in the keys file. .sp \n(Ppu .ne 2 @@ -73,7 +73,7 @@ Key entries use a fixed format of the form where \f\*[I-Font]keyno\f[] -is a positive integer (between 1 and 65534), +is a positive integer (between 1 and 65535), \f\*[I-Font]type\f[] is the message digest algorithm, \f\*[I-Font]key\f[] diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc index 3c74b1c9a..3b516a1cc 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd June 6 2019 +.Dd June 7 2019 .Dt NTP_KEYS 5mdoc File Formats .Os FreeBSD 11.2-RELEASE_SI .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 6, 2019 at 11:18:50 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 7, 2019 at 12:45:20 AM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME @@ -37,7 +37,7 @@ statement in the configuration file. While key number 0 is fixed by the NTP standard (as 56 zero bits) and may not be changed, -one or more keys numbered between 1 and 65534 +one or more keys numbered between 1 and 65535 may be arbitrarily set in the keys file. .Pp The key file uses the same comment conventions @@ -48,7 +48,7 @@ Key entries use a fixed format of the form .Pp where .Ar keyno -is a positive integer (between 1 and 65534), +is a positive integer (between 1 and 65535), .Ar type is the message digest algorithm, .Ar key diff --git a/ntpd/ntp.keys.html b/ntpd/ntp.keys.html index d23b15153..0577b05b1 100644 --- a/ntpd/ntp.keys.html +++ b/ntpd/ntp.keys.html @@ -61,7 +61,7 @@ Next:

Short Table of Contents

@@ -142,16 +142,24 @@ Key entries use a fixed format of the form is a positive integer (between 1 and 65534), type is the message digest algorithm, -and key is the key itself, and opt_IP_list is an optional comma-separated list of IPs +where the +keyno +should be trusted. that are allowed to serve time. +Each IP in +opt_IP_list +may contain an optional +/subnetbits +specification which identifies the number of bits for +the desired subnet of trust. If opt_IP_list is empty, -any properly-authenticated server message will be +any properly-authenticated message will be accepted.

The diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index a3db2406a..4ab986f13 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "06 Jun 2019" "4.3.97" "File Formats" +.TH ntp.keys 5 "07 Jun 2019" "4.3.98" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed June 6, 2019 at 11:18:59 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 7, 2019 at 12:45:29 AM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME @@ -54,7 +54,7 @@ statement in the configuration file. While key number 0 is fixed by the NTP standard (as 56 zero bits) and may not be changed, -one or more keys numbered between 1 and 65534 +one or more keys numbered between 1 and 65535 may be arbitrarily set in the keys file. .sp \n(Ppu .ne 2 @@ -73,7 +73,7 @@ Key entries use a fixed format of the form where \f\*[I-Font]keyno\f[] -is a positive integer (between 1 and 65534), +is a positive integer (between 1 and 65535), \f\*[I-Font]type\f[] is the message digest algorithm, \f\*[I-Font]key\f[] diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in index 01f337cec..36a2206ee 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd June 6 2019 +.Dd June 7 2019 .Dt NTP_KEYS 5 File Formats .Os FreeBSD 11.2-RELEASE_SI .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 6, 2019 at 11:18:50 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 7, 2019 at 12:45:20 AM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME @@ -37,7 +37,7 @@ statement in the configuration file. While key number 0 is fixed by the NTP standard (as 56 zero bits) and may not be changed, -one or more keys numbered between 1 and 65534 +one or more keys numbered between 1 and 65535 may be arbitrarily set in the keys file. .Pp The key file uses the same comment conventions @@ -48,7 +48,7 @@ Key entries use a fixed format of the form .Pp where .Ar keyno -is a positive integer (between 1 and 65534), +is a positive integer (between 1 and 65535), .Ar type is the message digest algorithm, .Ar key diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 740c92eb5..f15283808 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 June 6, 2019 at 11:18:26 PM by AutoGen 5.18.5 + * It has been AutoGen-ed June 7, 2019 at 12:44:56 AM by AutoGen 5.18.5 * From the definitions ntpd-opts.def * and the template file options * @@ -75,7 +75,7 @@ extern FILE * option_usage_fp; * static const strings for ntpd options */ static char const ntpd_opt_strs[3126] = -/* 0 */ "ntpd 4.3.97\n" +/* 0 */ "ntpd 4.3.98\n" "Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, 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" @@ -205,12 +205,12 @@ static char const ntpd_opt_strs[3126] = /* 2899 */ "output version information and exit\0" /* 2935 */ "version\0" /* 2943 */ "NTPD\0" -/* 2948 */ "ntpd - NTP daemon program - Ver. 4.3.97\n" +/* 2948 */ "ntpd - NTP daemon program - Ver. 4.3.98\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 3078 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3112 */ "\n\0" -/* 3114 */ "ntpd 4.3.97"; +/* 3114 */ "ntpd 4.3.98"; /** * ipv4 option description with @@ -1529,7 +1529,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.3.97\n\ + puts(_("ntpd 4.3.98\n\ Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, 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\ @@ -1670,7 +1670,7 @@ implied warranty.\n")); puts(_("output version information and exit")); /* referenced via ntpdOptions.pzUsageTitle */ - puts(_("ntpd - NTP daemon program - Ver. 4.3.97\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.3.98\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1678,7 +1678,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.3.97")); + puts(_("ntpd 4.3.98")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 9b4cecf10..175ec1680 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 June 6, 2019 at 11:18:26 PM by AutoGen 5.18.5 + * It has been AutoGen-ed June 7, 2019 at 12:44:56 AM by AutoGen 5.18.5 * From the definitions ntpd-opts.def * and the template file options * @@ -106,9 +106,9 @@ typedef enum { /** count of all options for ntpd */ #define OPTION_CT 38 /** ntpd version */ -#define NTPD_VERSION "4.3.97" +#define NTPD_VERSION "4.3.98" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.3.97" +#define NTPD_FULL_VERSION "ntpd 4.3.98" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index e15320583..0cd676be9 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpd 1ntpdman "06 Jun 2019" "4.3.97" "User Commands" +.TH ntpd 1ntpdman "07 Jun 2019" "4.3.98" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed June 6, 2019 at 11:19:01 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 7, 2019 at 12:45:30 AM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index 2edf6a043..3f5979101 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd June 6 2019 +.Dd June 7 2019 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed June 6, 2019 at 11:18:51 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 7, 2019 at 12:45:21 AM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html index 059269aef..1a6c39f39 100644 --- a/ntpd/ntpd.html +++ b/ntpd/ntpd.html @@ -67,7 +67,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.3.97 of ntpd. +

This document applies to version 4.3.98 of ntpd.

Short Table of Contents

@@ -309,7 +309,7 @@ used to select the program, defaulting to more. Both will exit with a status code of 0.

-
ntpd - NTP daemon program - Ver. 4.2.8p11
+
ntpd - NTP daemon program - Ver. 4.3.97
 Usage:  ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index 64aa1c257..1ce96661f 100644
--- a/ntpd/ntpd.man.in
+++ b/ntpd/ntpd.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpd @NTPD_MS@ "06 Jun 2019" "4.3.97" "User Commands"
+.TH ntpd @NTPD_MS@ "07 Jun 2019" "4.3.98" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed June 6, 2019 at 11:19:01 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2019 at 12:45:30 AM by AutoGen 5.18.5
 .\" From the definitions ntpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in
index 39ac2c688..56d796592 100644
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 6 2019
+.Dd June 7 2019
 .Dt NTPD @NTPD_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  6, 2019 at 11:18:51 PM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2019 at 12:45:21 AM by AutoGen 5.18.5
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpdc/invoke-ntpdc.texi b/ntpdc/invoke-ntpdc.texi
index 04b7fdf0a..08d70167d 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  June  6, 2019 at 11:19:07 PM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2019 at 12:45:36 AM by AutoGen 5.18.5
 # From the definitions    ntpdc-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -76,7 +76,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTPD control program - Ver. 4.3.97
+ntpdc - vendor-specific NTPD control program - Ver. 4.3.98
 Usage:  ntpdc [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index 9e709fb20..500aad450 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  June  6, 2019 at 11:19:03 PM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2019 at 12:45:32 AM by AutoGen 5.18.5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -69,7 +69,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpdc options
  */
 static char const ntpdc_opt_strs[1908] =
-/*     0 */ "ntpdc 4.3.97\n"
+/*     0 */ "ntpdc 4.3.98\n"
             "Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, 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,14 +128,14 @@ static char const ntpdc_opt_strs[1908] =
 /*  1693 */ "no-load-opts\0"
 /*  1706 */ "no\0"
 /*  1709 */ "NTPDC\0"
-/*  1715 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.3.97\n"
+/*  1715 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.3.98\n"
             "Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
 /*  1844 */ "$HOME\0"
 /*  1850 */ ".\0"
 /*  1852 */ ".ntprc\0"
 /*  1859 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1893 */ "\n\0"
-/*  1895 */ "ntpdc 4.3.97";
+/*  1895 */ "ntpdc 4.3.98";
 
 /**
  *  ipv4 option description with
@@ -796,7 +796,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpdcOptions.pzCopyright */
-  puts(_("ntpdc 4.3.97\n\
+  puts(_("ntpdc 4.3.98\n\
 Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, 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\
@@ -862,14 +862,14 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpdcOptions.pzUsageTitle */
-  puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.3.97\n\
+  puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.3.98\n\
 Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
 
   /* referenced via ntpdcOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntpdcOptions.pzFullVersion */
-  puts(_("ntpdc 4.3.97"));
+  puts(_("ntpdc 4.3.98"));
 
   /* referenced via ntpdcOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 95b4a29b0..7b7154677 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  June  6, 2019 at 11:19:03 PM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2019 at 12:45:32 AM by AutoGen 5.18.5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -83,9 +83,9 @@ typedef enum {
 /** count of all options for ntpdc */
 #define OPTION_CT    15
 /** ntpdc version */
-#define NTPDC_VERSION       "4.3.97"
+#define NTPDC_VERSION       "4.3.98"
 /** Full ntpdc version text */
-#define NTPDC_FULL_VERSION  "ntpdc 4.3.97"
+#define NTPDC_FULL_VERSION  "ntpdc 4.3.98"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman
index 49ca53b69..41b02afd1 100644
--- a/ntpdc/ntpdc.1ntpdcman
+++ b/ntpdc/ntpdc.1ntpdcman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpdc 1ntpdcman "06 Jun 2019" "4.3.97" "User Commands"
+.TH ntpdc 1ntpdcman "07 Jun 2019" "4.3.98" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed June 6, 2019 at 11:19:08 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2019 at 12:45:38 AM by AutoGen 5.18.5
 .\" From the definitions ntpdc-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc
index 6b9923756..217110390 100644
--- a/ntpdc/ntpdc.1ntpdcmdoc
+++ b/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd June 6 2019
+.Dd June 7 2019
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  6, 2019 at 11:19:05 PM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2019 at 12:45:35 AM by AutoGen 5.18.5
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html
index 418ad35cf..ff32cb66a 100644
--- a/ntpdc/ntpdc.html
+++ b/ntpdc/ntpdc.html
@@ -64,7 +64,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.3.97 of ntpdc.
+
This document applies to version 4.3.98 of ntpdc.
 

 
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -214,7 +214,7 @@ 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.3.97
+
ntpdc - vendor-specific NTPD control program - Ver. 4.3.98
 Usage:  ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index e1a1441bb..b6e606779 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpdc @NTPDC_MS@ "06 Jun 2019" "4.3.97" "User Commands"
+.TH ntpdc @NTPDC_MS@ "07 Jun 2019" "4.3.98" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed June 6, 2019 at 11:19:08 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2019 at 12:45:38 AM by AutoGen 5.18.5
 .\" From the definitions ntpdc-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index 9f37e7d7e..d64b55d1c 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 6 2019
+.Dd June 7 2019
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  6, 2019 at 11:19:05 PM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2019 at 12:45:35 AM by AutoGen 5.18.5
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi
index c12b5815a..7cc757f7f 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  June  6, 2019 at 11:19:16 PM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2019 at 12:45:46 AM by AutoGen 5.18.5
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -944,7 +944,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.3.97
+ntpq - standard NTP query program - Ver. 4.3.98
 Usage:  ntpq [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 name resolution
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index 407b4f491..b5898a679 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  June  6, 2019 at 11:19:09 PM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2019 at 12:45:39 AM by AutoGen 5.18.5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -69,7 +69,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpq options
  */
 static char const ntpq_opt_strs[1971] =
-/*     0 */ "ntpq 4.3.97\n"
+/*     0 */ "ntpq 4.3.98\n"
             "Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, 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"
@@ -132,13 +132,13 @@ static char const ntpq_opt_strs[1971] =
 /*  1766 */ "no-load-opts\0"
 /*  1779 */ "no\0"
 /*  1782 */ "NTPQ\0"
-/*  1787 */ "ntpq - standard NTP query program - Ver. 4.3.97\n"
+/*  1787 */ "ntpq - standard NTP query program - Ver. 4.3.98\n"
             "Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
 /*  1905 */ "$HOME\0"
 /*  1911 */ ".\0"
 /*  1913 */ ".ntprc\0"
 /*  1920 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1954 */ "ntpq 4.3.97\0"
+/*  1954 */ "ntpq 4.3.98\0"
 /*  1966 */ "hash";
 
 /**
@@ -841,7 +841,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpqOptions.pzCopyright */
-  puts(_("ntpq 4.3.97\n\
+  puts(_("ntpq 4.3.98\n\
 Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, 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\
@@ -910,11 +910,11 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpqOptions.pzUsageTitle */
-  puts(_("ntpq - standard NTP query program - Ver. 4.3.97\n\
+  puts(_("ntpq - standard NTP query program - Ver. 4.3.98\n\
 Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
 
   /* referenced via ntpqOptions.pzFullVersion */
-  puts(_("ntpq 4.3.97"));
+  puts(_("ntpq 4.3.98"));
 
   /* referenced via ntpqOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 9bd853379..90ee0a7a8 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  June  6, 2019 at 11:19:09 PM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2019 at 12:45:39 AM by AutoGen 5.18.5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -84,9 +84,9 @@ typedef enum {
 /** count of all options for ntpq */
 #define OPTION_CT    16
 /** ntpq version */
-#define NTPQ_VERSION       "4.3.97"
+#define NTPQ_VERSION       "4.3.98"
 /** Full ntpq version text */
-#define NTPQ_FULL_VERSION  "ntpq 4.3.97"
+#define NTPQ_FULL_VERSION  "ntpq 4.3.98"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index c28727f6b..c66277434 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpq 1ntpqman "06 Jun 2019" "4.3.97" "User Commands"
+.TH ntpq 1ntpqman "07 Jun 2019" "4.3.98" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed June 6, 2019 at 11:19:17 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2019 at 12:45:48 AM by AutoGen 5.18.5
 .\" From the definitions ntpq-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index 42493619b..24ebbc97f 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd June 6 2019
+.Dd June 7 2019
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  6, 2019 at 11:19:14 PM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2019 at 12:45:44 AM by AutoGen 5.18.5
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/ntpq.html b/ntpq/ntpq.html
index 78b3e923e..77c0456c4 100644
--- a/ntpq/ntpq.html
+++ b/ntpq/ntpq.html
@@ -73,7 +73,7 @@ monitor the operational status
 and determine the performance of
 ntpd, the NTP daemon.
 

-
This document applies to version 4.3.97 of ntpq.
+
This document applies to version 4.3.98 of ntpq.
 

 

 
• ntpq Description:  
@@ -154,13 +154,9 @@ Next: , Previous: 
+

+

 
• ntpq usage:  
 

 
• ntpq ipv4:  
@@ -245,6 +252,7 @@ interactive format commands from the standard input.
 
 
 
1.1.1 Internal Commands

+
 
Interactive format commands consist of a keyword followed by zero
 to four arguments.
 Only enough characters of the full keyword to
@@ -254,42 +262,37 @@ uniquely identify the command need be typed.
 number of interactive format commands are executed entirely within
 the
 ntpq
-utility itself and do not result in NTP mode 6
+utility itself and do not result in NTP
 requests being sent to a server.
 These are described following.
 

-
? [command_keyword]

-
help [command_keyword]

+
? [command]

+
help [command]

 
A
 ‘?’
-by itself will print a list of all the command
-keywords known to this incarnation of
+by itself will print a list of all the commands
+known to
 ntpq
 A
 ‘?’
-followed by a command keyword will print function and usage
+followed by a command name will print function and usage
 information about the command.
-This command is probably a better
-source of information about
-ntpq
-than this manual
-page.
 

-
addvars variable_name[=value] ...

-
rmvars variable_name ...

+
addvars name[=value][,...]

+
rmvars name[,...]

 
clearvars

 
showvars

-
The data carried by NTP mode 6 messages consists of a list of
+
The arguments to this command consist of a list of
 items of the form
-‘variable_name=value’,
+name[=value],
 where the
-‘=value’
+.No = Ns Ar value
 is ignored, and can be omitted,
 in requests to the server to read variables.
 The
 ntpq
-utility maintains an internal list in which data to be included in control
-messages can be assembled, and sent using the
+utility maintains an internal list in which data to be included in
+messages can be assembled, and displayed or set using the
 readlist
 and
 writelist
@@ -304,36 +307,32 @@ The
 rmvars
 command can be used to remove individual variables from the list,
 while the
-clearlist
+clearvars
 command removes all variables from the
 list.
 The
 showvars
 command displays the current list of optional variables.
 

-
authenticate [yes | no]

+
authenticate [yes|no]

 
Normally
 ntpq
 does not authenticate requests unless
 they are write requests.
 The command
-‘authenticate yes’
+authenticate yes
 causes
 ntpq
 to send authentication with all requests it
 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.
+requests slightly differently.
 The command
-‘authenticate’
+authenticate
 causes
 ntpq
 to display whether or not
-ntpq
-is currently autheinticating requests.
+it is currently authenticating requests.
 

 
cooked

 
Causes output from query commands to be "cooked", so that
@@ -343,15 +342,15 @@ will have their
 values reformatted for human consumption.
 Variables which
 ntpq
-thinks should have a decodable value but didn’t are
+could not decode completely are
 marked with a trailing
 ‘?’.
 

-
debug [more | less | off]

+
debug [more|less|off]

 
With no argument, displays the current debug level.
-Otherwise, the debug level is changed to the indicated level.
+Otherwise, the debugging level is changed as indicated.
 

-
delay milliseconds

+
delay [milliseconds]

 
Specify a time interval to be added to timestamps included in
 requests which require authentication.
 This is used to enable
@@ -360,17 +359,25 @@ or between machines whose clocks are unsynchronized.
 Actually the
 server does not now require timestamps in authenticated requests,
 so this command may be obsolete.
+Without any arguments, displays the current delay.
+

+
drefid [hash|ipv4]

+
Display refids as IPv4 or hash.
+Without any arguments, displays whether refids are shown as IPv4
+addresses or hashes.
 

 
exit

 
Exit
 ntpq
 

-
host hostname

+
host [name]

 
Set the host to which future queries will be sent.
-hostname
+The
+name
 may be either a host name or a numeric address.
+Without any arguments, displays the current host.
 

-
hostnames [yes | no]

+
hostnames [yes|no]

 
If
 yes
 is specified, host names are printed in
@@ -385,8 +392,10 @@ unless
 modified using the command line
 -n
 switch.
+Without any arguments, displays whether host names or numeric addresses
+are shown.
 

-
keyid keyid

+
keyid [keyid]

 
This command allows the specification of a key number to be
 used to authenticate configuration requests.
 This must correspond
@@ -394,20 +403,22 @@ to the
 controlkey
 key number the server has been configured to use for this
 purpose.
+Without any arguments, displays the current
+keyid.
 

-
keytype [md5 | OpenSSLDigestType]

-
Specify the type of key to use for authenticating requests.
-md5
-is alway supported.
+
keytype [digest]

+
Specify the digest algorithm to use for authenticating requests, with default
+MD5.
 If
 ntpq
-was built with OpenSSL support,
-any digest type supported by OpenSSL can also be provided.
+was built with OpenSSL support, and OpenSSL is installed,
+digest
+can be any message digest algorithm supported by OpenSSL.
 If no argument is given, the current
-keytype
-is displayed.
+keytype digest
+algorithm used is displayed.
 

-
ntpversion [1 | 2 | 3 | 4]

+
ntpversion [1|2|3|4]

 
Sets the NTP version number which
 ntpq
 claims in
@@ -426,9 +437,12 @@ 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.
-poll
+

+
poll [n] [verbose]

+
Poll an NTP server in client mode
 n
-verbose
+times.
+Poll not implemented yet.
 

 
quit

 
Exit
@@ -441,17 +455,18 @@ The only formating/interpretation done on
 the data is to transform nonascii data into a printable (but barely
 understandable) form.
 

-
timeout milliseconds

+
timeout [milliseconds]

 
Specify a timeout period for responses to server queries.
 The
 default is about 5000 milliseconds.
+Without any arguments, displays the current timeout period.
 Note that since
 ntpq
 retries each query once after a timeout, the total waiting time for
 a timeout will be twice the timeout value set.
 

 
version

-
Print the version of the
+
Display the version of the
 ntpq
 program.
 

@@ -459,9 +474,12 @@ program.
 
 
 
1.1.1.1 Control Message Commands

-
Association IDs are used to identify system, peer and clock variables.
-System variables are assigned an association ID of zero and system name space, while each association is assigned a nonzero association ID and peer namespace.
-Most control commands send a single mode-6 message to the server and expect a single response message.
+
Association ids are used to identify system, peer and clock variables.
+System variables are assigned an association id of zero and system name
+space, while each association is assigned a nonzero association id and
+peer namespace.
+Most control commands send a single message to the server and expect a
+single response message.
 The exceptions are the
 peers
 command, which sends a series of messages,
@@ -471,75 +489,139 @@ and
 mreadvar
 commands, which iterate over a range of associations.
 

+
apeers

+
Display a list of peers in the form:
+

+
[tally]remote refid assid st t when pool reach delay offset jitter
+

+
where the output is just like the
+peers
+command except that the
+refid
+is displayed in hex format and the association number is also displayed.
+

 
associations

 
Display a list of mobilized associations in the form:
 

 
ind assid status conf reach auth condition last_event cnt
 

 

-
Sy String Ta Sy Description

+
Sy Variable Ta Sy Description

 
ind Ta index on this list

-
assid Ta association ID

+
assid Ta association id

 
status Ta peer status word

-
conf Ta yes: persistent, no: ephemeral

-
reach Ta yes: reachable, no: unreachable

-
auth Ta ok, yes, bad and none

-
condition Ta selection status (see the select field of the peer status word)

-
last_event Ta event report (see the event field of the peer status word)

-
cnt Ta event count (see the count field of the peer status word)

+
conf Ta yes: No persistent, no: No ephemeral

+
reach Ta yes: No reachable, no: No unreachable

+
auth Ta ok, yes, bad No and none

+
condition Ta selection status (see the select No field of the peer status word)

+
last_event Ta event report (see the event No field of the peer status word)

+
cnt Ta event count (see the count No field of the peer status word)

 

 

 
authinfo

-
Display the authentication statistics.
-

-
clockvar assocID [name[=value]] [...]

-
cv assocID [name[=value]] [...]

-
Display a list of clock variables for those associations supporting a reference clock.
-

-
:config [...]

-
Send the remainder of the command line, including whitespace, to the server as a run-time configuration command in the same format as a line in the configuration file. This command is experimental until further notice and clarification. Authentication is of course required.
+
Display the authentication statistics counters:
+time since reset, stored keys, free keys, key lookups, keys not found,
+uncached keys, expired keys, encryptions, decryptions.
+

+
clocklist [associd]

+
cl [associd]

+
Display all clock variables in the variable list for those associations
+supporting a reference clock.
+

+
clockvar [associd] [name[=value]][,...]

+
cv [associd] [name[=value]][,...]

+
Display a list of clock variables for those associations supporting a
+reference clock.
+

+
:config configuration command line

+
Send the remainder of the command line, including whitespace, to the
+server as a run-time configuration command in the same format as a line
+in the configuration file.
+This command is experimental until further notice and clarification.
+Authentication is of course required.
 

 
config-from-file filename

-
Send the each line of
+
Send each line of
 filename
-to the server as run-time configuration commands in the same format as a line in the configuration file. This command is experimental until further notice and clarification. Authentication is required.
+to the server as run-time configuration commands in the same format as
+lines in the configuration file.
+This command is experimental until further notice and clarification.
+Authentication is required.
 

 
ifstats

-
Display statistics for each local network address. Authentication is required.
+
Display status and statistics counters for each local network interface address:
+interface number, interface name and address or broadcast, drop, flag,
+ttl, mc, received, sent, send failed, peers, uptime.
+Authentication is required.
 

 
iostats

-
Display network and reference clock I/O statistics.
+
Display network and reference clock I/O statistics:
+time since reset, receive buffers, free receive buffers, used receive buffers,
+low water refills, dropped packets, ignored packets, received packets,
+packets sent, packet send failures, input wakeups, useful input wakeups.
 

 
kerninfo

-
Display kernel loop and PPS statistics. As with other ntpq output, times are in milliseconds. The precision value displayed is in milliseconds as well, unlike the precision system variable.
+
Display kernel loop and PPS statistics:
+associd, status, pll offset, pll frequency, maximum error,
+estimated error, kernel status, pll time constant, precision,
+frequency tolerance, pps frequency, pps stability, pps jitter,
+calibration interval, calibration cycles, jitter exceeded,
+stability exceeded, calibration errors.
+As with other ntpq output, times are in milliseconds; very small values
+may be shown as exponentials.
+The precision value displayed is in milliseconds as well, unlike the
+precision system variable.
 

 
lassociations

-
Perform the same function as the associations command, except display mobilized and unmobilized associations.
+
Perform the same function as the associations command, except display
+mobilized and unmobilized associations, including all clients.
+

+
lopeers [-4|-6]

+
Display a list of all peers and clients showing
+dstadr
+(associated with the given IP version).
 

-
lopeers [-4 | -6]

-
Obtain and print a list of all peers and clients showing
-dstadr
-(associated with any given IP version).
+
lpassociations

+
Display the last obtained list of associations, including all clients.
 

-
lpeers [-4 | -6]

-
Print a peer spreadsheet for the appropriate IP version(s).
-dstadr
-(associated with any given IP version).
+
lpeers [-4|-6]

+
Display a list of all peers and clients (associated with the given IP version).
 

 
monstats

-
Display monitor facility statistics.
+
Display monitor facility status, statistics, and limits:
+enabled, addresses, peak addresses, maximum addresses,
+reclaim above count, reclaim older than, kilobytes, maximum kilobytes.
+

+
mreadlist associdlo associdhi

+
mrl associdlo associdhi

+
Perform the same function as the
+readlist
+command for a range of association ids.
+

+
mreadvar associdlo associdhi [name][,...]

+
This range may be determined from the list displayed by any
+command showing associations.
+

+
mrv associdlo associdhi [name][,...]

+
Perform the same function as the
+readvar
+command for a range of association ids.
+This range may be determined from the list displayed by any
+command showing associations.
 

-
mrulist [limited | kod | mincount=count | laddr=localaddr | sort=sortorder | resany=hexmask | resall=hexmask]

-
Obtain and print traffic counts collected and maintained by the monitor facility.
+
mrulist [limited | kod | mincount=count | laddr=localaddr | sort=[-]sortorder | resany=hexmask | resall=hexmask]

+
Display traffic counts of the most recently seen source addresses
+collected and maintained by the monitor facility.
 With the exception of
-sort=sortorder,
+sort=[-]sortorder,
 the options filter the list returned by
-ntpd.
+ntpd(8).
 The
 limited
 and
 kod
-options return only entries representing client addresses from which the last packet received triggered either discarding or a KoD response.
+options return only entries representing client addresses from which the
+last packet received triggered either discarding or a KoD response.
 The
 mincount=count
 option filters entries representing less than
@@ -560,19 +642,22 @@ The
 sortorder
 defaults to
 lstint
-and may be any of
+and may be 
 addr,
-count,
 avgint,
+count,
 lstint,
-or any of those preceded by a minus sign (hyphen) to reverse the sort order.
+or any of those preceded by
+‘-’
+to reverse the sort order.
 The output columns are:
 

 
Column

 
Description
 

 
lstint

-
Interval in s between the receipt of the most recent packet from this address and the completion of the retrieval of the MRU list by
+
Interval in seconds between the receipt of the most recent packet from
+this address and the completion of the retrieval of the MRU list by
 ntpq
 

 
avgint

@@ -582,7 +667,8 @@ The output columns are:
 
Restriction flags associated with this address.
 Most are copied unchanged from the matching
 restrict
-command, however 0x400 (kod) and 0x20 (limited) flags are cleared unless the last packet from this address triggered a rate control response.
+command, however 0x400 (kod) and 0x20 (limited) flags are cleared unless
+the last packet from this address triggered a rate control response.
 

 
r

 
Rate control indicator, either
@@ -606,26 +692,17 @@ rate limiting by discarding, or rate limiting with a KoD response, respectively.
 
Source port of last packet from this address.
 

 
remote address

-
DNS name, numeric address, or address followed by
+
host or DNS name, numeric address, or address followed by
 claimed DNS name which could not be verified in parentheses.
 

 

 

-
mreadvar assocID assocID [variable_name[=value] ...]

-
mrv assocID assocID [variable_name[=value] ...]

-
Perform the same function as the
-readvar
-command, except for a range of association IDs.
-This range is determined from the association list cached by the most recent
-associations
-command.
-

 
opeers [-4 | -6]

 
Obtain and print the old-style list of all peers and clients showing
-dstadr
-(associated with any given IP version),
+dstadr
+(associated with the given IP version),
 rather than the
-refid.
+refid.
 

 
passociations

 
Perform the same function as the
@@ -650,24 +727,28 @@ field of the
 

 
remote

 
host name (or IP number) of peer.
-The value displayed will be truncated to 15 characters  unless the
+The value displayed will be truncated to 15 characters unless the
+ntpq
 -w
-flag is given, in which case the full value will be displayed
-on the first line,
-and the remaining data is displayed on the next line.
+option is given, in which case the full value will be displayed
+on the first line, and if too long,
+the remaining data will be displayed on the next line.
 

 
refid

-
association ID or
+
source IP address or
 .Lk decode.html#kiss "’kiss code"
 

 
st

-
stratum
+
stratum: 0 for local reference clocks, 1 for servers with local
+reference clocks, ..., 16 for unsynchronized server clocks
 

 
t

 
u:
 unicast or manycast client,
 b:
 broadcast or multicast client,
+p:
+pool source,
 l:
 local (reference clock),
 s:
@@ -680,10 +761,13 @@ broadcast server,
 multicast server
 

 
when

-
sec/min/hr since last received packet
+
time in seconds, minutes, hours, or days since the last packet
+was received, or
+‘-’
+if a packet has never been received
 

 
poll

-
poll interval (log2 s)
+
poll interval (s)
 

 
reach

 
reach shift register (octal)
@@ -695,124 +779,137 @@ multicast server
 
offset of server relative to this host
 

 
jitter

-
jitter
+
offset RMS error estimate.
 

 

 
-
apeers

-
Display a list of peers in the form:
-

-
[tally]remote refid assid st t when pool reach delay offset jitter
-

-
where the output is just like the
-peers
-command except that the
-refid
-is displayed in hex format and the association number is also displayed.
-

-
pstats assocID

-
Show the statistics for the peer with the given
-assocID.
-

-
readlist assocID

-
rl assocID

-
Read the system or peer variables included in the variable list.
+
pstats associd

+
Display the statistics for the peer with the given
+associd:
+associd, status, remote host, local address, time last received,
+time until next send, reachability change, packets sent,
+packets received, bad authentication, bogus origin, duplicate,
+bad dispersion, bad reference time, candidate order.
+

+
readlist [associd]

+
rl [associd]

+
Display all system or peer variables.
+If the
+associd
+is omitted, it is assumed to be zero.
 

-
readvar assocID name[=value] [, ...]

-
rv assocID name[=value] [, ...]

-
Display the specified variables.
+
readvar [associd name[=value] [, ...]]

+
rv [associd name[=value] [, ...]]

+
Display the specified system or peer variables.
 If
-assocID
+associd
 is zero, the variables are from the
 System Variables
 name space, otherwise they are from the
 Peer Variables
 name space.
 The
-assocID
+associd
 is required, as the same name can occur in both spaces.
 If no
 name
 is included, all operative variables in the name space are displayed.
-

-
In this case only, if the
-assocID
-is omitted, it is assumed zero.
+In this case only, if the
+associd
+is omitted, it is assumed to be zero.
 Multiple names are specified with comma separators and without whitespace.
 Note that time values are represented in milliseconds
 and frequency values in parts-per-million (PPM).
 Some NTP timestamps are represented in the format
-YYYYMMDDTTTT ,
-where YYYY is the year,
-MM the month of year,
-DD the day of month and
-TTTT the time of day.
+YYYYMM DD TTTT,
+where
+YYYY
+is the year,
+MM
+the month of year,
+DD
+the day of month and
+TTTT
+the time of day.
 

 
reslist

-
Show the access control (restrict) list for
+
Display the access control (restrict) list for
 ntpq
-

-

+Authentication is required.
+

 
saveconfig filename

-
Write the current configuration,
-including any runtime modifications given with
+
Save the current configuration,
+including any runtime modifications made by
 :config
 or
 config-from-file,
-to the ntpd host’s file
+to the NTP server host file
 filename.
 This command will be rejected by the server unless
 .Lk miscopt.html#saveconfigdir "saveconfigdir"
 appears in the
-ntpd
+ntpd(8)
 configuration file.
 filename
 can use
-strftime()
-format specifies to substitute the current date and time, for example,
-q]saveconfig ntp-%Y%m%d-%H%M%S.confq].
-The filename used is stored in system variable
+date(1)
+format specifiers to substitute the current date and time, for
+example,
+

+
saveconfig ntp-%Y%m%d-%H%M%S.conf. 
+

+
The filename used is stored in system variable
 savedconfig.
 Authentication is required.
 

+
sysinfo

+
Display system operational summary:
+associd, status, system peer, system peer mode, leap indicator,
+stratum, log2 precision, root delay, root dispersion,
+reference id, reference time, system jitter, clock jitter,
+clock wander, broadcast delay, symm. auth. delay.
+

+
sysstats

+
Display system uptime and packet counts maintained in the
+protocol module:
+uptime, sysstats reset, packets received, current version,
+older version, bad length or format, authentication failed,
+declined, restricted, rate limited, KoD responses,
+processed for time.
+

 
timerstats

-
Display interval timer counters.
+
Display interval timer counters:
+time since reset, timer overruns, calls to transmit.
 

-
writelist assocID

-
Write the system or peer variables included in the variable list.
+
writelist associd

+
Set all system or peer variables included in the variable list.
 

-
writevar assocID name=value [, ...]

-
Write the specified variables.
+
writevar associd name=value [, ...]

+
Set the specified variables in the variable list.
 If the
-assocID
+associd
 is zero, the variables are from the
 System Variables
 name space, otherwise they are from the
 Peer Variables
 name space.
 The
-assocID
+associd
 is required, as the same name can occur in both spaces.
-

-
sysinfo

-
Display operational summary.
-

-
sysstats

-
Print statistics counters maintained in the protocol module.
+Authentication is required.
 

 

 
 
 
1.1.1.2 Status Words and Kiss Codes

-
 
The current state of the operating program is shown
 in a set of status words
 maintained by the system.
 Status information is also available on a per-association basis.
-These words are displayed in the
-rv
+These words are displayed by the
+readlist
 and
-as
+associations
 commands both in hexadecimal and in decoded short tip strings.
 The codes, tips and short explanations are documented on the
 .Lk decode.html "Event Messages and Status Words"
@@ -831,10 +928,11 @@ in the reference identifier field in various billboards.
 
 
1.1.1.3 System Variables

 
The following system variables appear in the
-rv
+readlist
 billboard.
 Not all variables are displayed in some configurations.
-

+

+

 
Variable

 
Description
 

@@ -865,8 +963,18 @@ Not all variables are displayed in some configurations.
 
rootdisp

 
total dispersion to the primary reference clock
 

+
refid

+
reference id or
+.Lk decode.html#kiss "kiss code"
+

+
reftime

+
reference time
+

+
clock

+
date and time of day
+

 
peer

-
system peer association ID
+
system peer association id
 

 
tc

 
time constant and poll exponent (log2 s) (3-17)
@@ -874,25 +982,15 @@ Not all variables are displayed in some configurations.
 
mintc

 
minimum time constant (log2 s) (3-10)
 

-
clock

-
date and time of day
-

-
refid

-
reference ID or
-.Lk decode.html#kiss "kiss code"
-

-
reftime

-
reference time
-

 
offset

-
combined  offset of server relative to this host
+
combined offset of server relative to this host
+

+
frequency

+
frequency drift (PPM) relative to hardware clock
 

 
sys_jitter

 
combined system jitter
 

-
frequency

-
frequency offset (PPM) relative to hardware clock
-

 
clk_wander

 
clock frequency wander (PPM)
 

@@ -917,8 +1015,7 @@ the clock jitter statistic is computed by the clock discipline module.
 additional system variables are displayed,
 including some or all of the following,
 depending on the particular Autokey dance:
-

-

+

 
Variable

 
Description
 

@@ -950,7 +1047,7 @@ depending on the particular Autokey dance:
 
 
1.1.1.4 Peer Variables

 
The following peer variables appear in the
-rv
+readlist
 billboard for each association.
 Not all variables are displayed in some configurations.
 

@@ -959,7 +1056,7 @@ Not all variables are displayed in some configurations.
 
Description
 

 
associd

-
association ID
+
association id
 

 
status

 
.Lk decode.html#peer "peer status word"
@@ -992,12 +1089,15 @@ Not all variables are displayed in some configurations.
 
total root dispersion to the primary reference clock
 

 
refid

-
reference ID or
+
reference id or
 .Lk decode.html#kiss "kiss code"
 

 
reftime

 
reference time
 

+
rec

+
last packet received time
+

 
reach

 
reach register (octal)
 

@@ -1023,6 +1123,9 @@ Not all variables are displayed in some configurations.
 
flash

 
.Lk decode.html#flash "flash status word"
 

+
keyid

+
symmetric key id
+

 
offset

 
filter offset
 

@@ -1035,9 +1138,6 @@ Not all variables are displayed in some configurations.
 
jitter

 
filter jitter
 

-
ident

-
Autokey group name for this association
-

 
bias

 
unicast/broadcast bias
 

@@ -1050,7 +1150,8 @@ Not all variables are displayed in some configurations.
 bias
 variable is calculated when the first broadcast packet is received
 after the calibration volley.
-It represents the offset of the broadcast subgraph relative to the unicast subgraph.
+It represents the offset of the broadcast subgraph relative to the
+unicast subgraph.
 The
 xleave
 variable appears only for the interleaved symmetric and interleaved modes.
@@ -1076,7 +1177,7 @@ additional peer variables are displayed, including the following:
 
OpenSSL digest/signature scheme
 

 
initsequence

-
initial key ID
+
initial key id
 

 
initkey

 
initial key index
@@ -1084,12 +1185,15 @@ additional peer variables are displayed, including the following:
 
timestamp

 
Autokey signature timestamp
 

+
ident

+
Autokey group name for this association
+

 

 
 
 
1.1.1.5 Clock Variables

 
The following clock variables appear in the
-cv
+clocklist
 billboard for each association with a reference clock.
 Not all variables are displayed in some configurations.
 

@@ -1097,7 +1201,7 @@ Not all variables are displayed in some configurations.
 
Description
 

 
associd

-
association ID
+
association id
 

 
status

 
.Lk decode.html#clock "clock status word"
@@ -1130,7 +1234,7 @@ Not all variables are displayed in some configurations.
 
driver stratum
 

 
refid

-
driver reference ID
+
driver reference id
 

 
flags

 
driver flags
@@ -1189,7 +1293,7 @@ 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.8p11
+
ntpq - standard NTP query program - Ver. 4.3.97
 Usage:  ntpq [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 name resolution
@@ -1245,7 +1349,7 @@ Next: , Previous: 1.1.3 ipv4 option (-4)
 
 
-
This is the “force ipv4 dns name resolution” option.
+
This is the “force ipv4 name resolution” option.
 

 
This option has some usage constraints.  It:
 
    
@@ -1253,7 +1357,7 @@ Next: , Previous: 

 
-
Force DNS resolution of following host names on the command line
+
Force resolution of following host names on the command line
 to the IPv4 namespace.
 

 
@@ -1265,7 +1369,7 @@ Next: , Previou
 
1.1.4 ipv6 option (-6)

 
 
-
This is the “force ipv6 dns name resolution” option.
+
This is the “force ipv6 name resolution” option.
 

 
This option has some usage constraints.  It:
 

 
-
Force DNS resolution of following host names on the command line
+
Force resolution of following host names on the command line
 to the IPv6 namespace.
 

 
@@ -1329,7 +1433,7 @@ Next: , Previ
 
 
This is the “numeric host addresses” option.
 Output all host addresses in dotted-quad numeric format rather than
-converting to the canonical host names. 
+converting to the canonical host names.
 

 
 

@@ -1634,7 +1738,7 @@ The password must correspond to the key ID configured in ntp.conf f
 
Display server messages as received and without reformatting.
 

 

-
timeout millseconds

+
timeout milliseconds

 
Specify a timeout period for responses to server queries.
 The default is about 5000 milliseconds.
 Note that since ntpq retries each query once after a timeout
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index 244dd7b3f..3205bdaed 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpq @NTPQ_MS@ "06 Jun 2019" "4.3.97" "User Commands"
+.TH ntpq @NTPQ_MS@ "07 Jun 2019" "4.3.98" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed June 6, 2019 at 11:19:17 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2019 at 12:45:48 AM by AutoGen 5.18.5
 .\" From the definitions ntpq-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index 5f8d2d6dd..7adbc4de0 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 6 2019
+.Dd June 7 2019
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  6, 2019 at 11:19:14 PM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2019 at 12:45:44 AM by AutoGen 5.18.5
 .\"  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 7a0937333..908551924 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  June  6, 2019 at 11:19:21 PM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2019 at 12:45:51 AM by AutoGen 5.18.5
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index 9d67782b1..f3b54b1de 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  June  6, 2019 at 11:19:19 PM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2019 at 12:45:49 AM by AutoGen 5.18.5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -61,7 +61,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpsnmpd options
  */
 static char const ntpsnmpd_opt_strs[1607] =
-/*     0 */ "ntpsnmpd 4.3.97\n"
+/*     0 */ "ntpsnmpd 4.3.98\n"
             "Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, 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"
@@ -101,14 +101,14 @@ static char const ntpsnmpd_opt_strs[1607] =
 /*  1413 */ "no-load-opts\0"
 /*  1426 */ "no\0"
 /*  1429 */ "NTPSNMPD\0"
-/*  1438 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.3.97\n"
+/*  1438 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.3.98\n"
             "Usage:  %s [ - [] | --[{=| }] ]...\n\0"
 /*  1540 */ "$HOME\0"
 /*  1546 */ ".\0"
 /*  1548 */ ".ntprc\0"
 /*  1555 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1589 */ "\n\0"
-/*  1591 */ "ntpsnmpd 4.3.97";
+/*  1591 */ "ntpsnmpd 4.3.98";
 
 /**
  *  nofork option description:
@@ -554,7 +554,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpsnmpdOptions.pzCopyright */
-  puts(_("ntpsnmpd 4.3.97\n\
+  puts(_("ntpsnmpd 4.3.98\n\
 Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, 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\
@@ -599,14 +599,14 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpsnmpdOptions.pzUsageTitle */
-  puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.3.97\n\
+  puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.3.98\n\
 Usage:  %s [ - [] | --[{=| }] ]...\n"));
 
   /* referenced via ntpsnmpdOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntpsnmpdOptions.pzFullVersion */
-  puts(_("ntpsnmpd 4.3.97"));
+  puts(_("ntpsnmpd 4.3.98"));
 
   /* referenced via ntpsnmpdOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 47cbf9532..b7c7eb4ca 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  June  6, 2019 at 11:19:19 PM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2019 at 12:45:49 AM by AutoGen 5.18.5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -76,9 +76,9 @@ typedef enum {
 /** count of all options for ntpsnmpd */
 #define OPTION_CT    8
 /** ntpsnmpd version */
-#define NTPSNMPD_VERSION       "4.3.97"
+#define NTPSNMPD_VERSION       "4.3.98"
 /** Full ntpsnmpd version text */
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.3.97"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.3.98"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index 4b09ceaeb..7104c21ba 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsnmpd 1ntpsnmpdman "06 Jun 2019" "4.3.97" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "07 Jun 2019" "4.3.98" "User Commands"
 .\"
 .\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed June 6, 2019 at 11:19:22 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2019 at 12:45:53 AM by AutoGen 5.18.5
 .\" From the definitions ntpsnmpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index 35276815e..7f7ee6696 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd June 6 2019
+.Dd June 7 2019
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  6, 2019 at 11:19:20 PM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2019 at 12:45:50 AM by AutoGen 5.18.5
 .\"  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 38c1efb00..323204f0c 100644
--- a/ntpsnmpd/ntpsnmpd.html
+++ b/ntpsnmpd/ntpsnmpd.html
@@ -71,7 +71,7 @@ Next: