From: Harlan Stenn Date: Wed, 24 Jan 2018 08:44:24 +0000 (+0000) Subject: Update ntpq peer documentation to describe the 'p' type X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=017a662ce65128b518dd6a153ee7dcb38ee57afd;p=thirdparty%2Fntp.git Update ntpq peer documentation to describe the 'p' type bk: 5a684768TbVbb8zV6M4azR8ky2pnPw --- diff --git a/ChangeLog b/ChangeLog index 17e9243e5..cabeba3ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,7 @@ * Warn the user if deprecated "driftfile name WanderThreshold" is used. HStenn. * Update the documentation in ntp.conf.def . HStenn. * restrictions() must return restrict flags and ippeerlimit. HStenn. +* Update ntpq peer documentation to describe the 'p' type. HStenn. --- (4.2.8p10) 2017/03/21 Released by Harlan Stenn diff --git a/NEWS b/NEWS index 4114778fd..83726c70e 100644 --- a/NEWS +++ b/NEWS @@ -8,7 +8,7 @@ Focus: Security, Bug fixes, enhancements. Severity: MEDIUM ? This release fixes 1 medium-, 2 low-/medium-, and 1 informational/medum-severity -vulnerabilities, and provides 58 other non-security fixes and improvements: +vulnerabilities, and provides 59 other non-security fixes and improvements: update-leap needs the following perl modules: Net::SSLeay diff --git a/html/ntpq.html b/html/ntpq.html index 6fe4dfc09..4789c8ba9 100644 --- a/html/ntpq.html +++ b/html/ntpq.html @@ -11,7 +11,7 @@ giffrom Pogo, Walt Kelly

A typical NTP monitoring packet

Last update: - 31-Jan-2014 06:54 + 24-Jan-2018 08:35 UTC


More Help

@@ -232,9 +232,16 @@ t - u: unicast or manycast client, b: - broadcast or multicast client, l: local (reference clock), s: symmetric (peer), A: manycast server, B: - broadcast server, M: multicast server + + u: unicast or manycast client, + b: broadcast or multicast client, + p: pool source, + l: local (reference clock), + s: symmetric (peer), + A: manycast server, + B: broadcast server, + M: multicast server + when diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi index ff097550f..96613240d 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 May 19, 2017 at 12:33:24 PM by AutoGen 5.18.5 +# It has been AutoGen-ed January 24, 2018 at 08:38:44 AM by AutoGen 5.18.5 # From the definitions ntpq-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -523,6 +523,8 @@ reference clocks, ..., 16 for unsynchronized server clocks unicast or manycast client, @code{b}: broadcast or multicast client, +@code{p}: +pool source, @code{l}: local (reference clock), @code{s}: @@ -942,7 +944,7 @@ with a status code of 0. @exampleindent 0 @example -ntpq - standard NTP query program - Ver. 4.2.8p10 +ntpq - standard NTP query program - Ver. 4.2.8p11 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 959fb39b4..a94a7e182 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 May 19, 2017 at 12:33:14 PM by AutoGen 5.18.5 + * It has been AutoGen-ed January 24, 2018 at 08:38:33 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[1977] = -/* 0 */ "ntpq 4.2.8p10\n" +/* 0 */ "ntpq 4.2.8p11\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[1977] = /* 1768 */ "no-load-opts\0" /* 1781 */ "no\0" /* 1784 */ "NTPQ\0" -/* 1789 */ "ntpq - standard NTP query program - Ver. 4.2.8p10\n" +/* 1789 */ "ntpq - standard NTP query program - Ver. 4.2.8p11\n" "Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n\0" /* 1909 */ "$HOME\0" /* 1915 */ ".\0" /* 1917 */ ".ntprc\0" /* 1924 */ "http://bugs.ntp.org, bugs@ntp.org\0" -/* 1958 */ "ntpq 4.2.8p10\0" +/* 1958 */ "ntpq 4.2.8p11\0" /* 1972 */ "hash"; /** @@ -841,7 +841,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpqOptions.pzCopyright */ - puts(_("ntpq 4.2.8p10\n\ + puts(_("ntpq 4.2.8p11\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.2.8p10\n\ + puts(_("ntpq - standard NTP query program - Ver. 4.2.8p11\n\ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); /* referenced via ntpqOptions.pzFullVersion */ - puts(_("ntpq 4.2.8p10")); + puts(_("ntpq 4.2.8p11")); /* referenced via ntpqOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpq/ntpq-opts.def b/ntpq/ntpq-opts.def index 782ca2fa8..f34653d12 100644 --- a/ntpq/ntpq-opts.def +++ b/ntpq/ntpq-opts.def @@ -635,6 +635,8 @@ reference clocks, ..., 16 for unsynchronized server clocks unicast or manycast client, .Ic b : broadcast or multicast client, +.Ic p : +pool source, .Ic l : local (reference clock), .Ic s : diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 569e985bb..0651a6a63 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 May 19, 2017 at 12:33:14 PM by AutoGen 5.18.5 + * It has been AutoGen-ed January 24, 2018 at 08:38:33 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.2.8p10" +#define NTPQ_VERSION "4.2.8p11" /** Full ntpq version text */ -#define NTPQ_FULL_VERSION "ntpq 4.2.8p10" +#define NTPQ_FULL_VERSION "ntpq 4.2.8p11" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman index 4a62426b0..44f385e68 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 "19 May 2017" "4.2.8p10" "User Commands" +.TH ntpq 1ntpqman "24 Jan 2018" "4.2.8p11" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 19, 2017 at 12:33:25 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 24, 2018 at 08:38:45 AM by AutoGen 5.18.5 .\" From the definitions ntpq-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -731,6 +731,8 @@ reference clocks, ..., 16 for unsynchronized server clocks unicast or manycast client, \f\*[B-Font]b\f[]: broadcast or multicast client, +\f\*[B-Font]p\f[]: +pool source, \f\*[B-Font]l\f[]: local (reference clock), \f\*[B-Font]s\f[]: diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc index 3b133adfd..a8caa8fa9 100644 --- a/ntpq/ntpq.1ntpqmdoc +++ b/ntpq/ntpq.1ntpqmdoc @@ -1,9 +1,9 @@ -.Dd May 19 2017 +.Dd January 24 2018 .Dt NTPQ 1ntpqmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpq-opts.mdoc) .\" -.\" It has been AutoGen-ed May 19, 2017 at 12:33:22 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 24, 2018 at 08:38:42 AM by AutoGen 5.18.5 .\" From the definitions ntpq-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -525,6 +525,8 @@ reference clocks, ..., 16 for unsynchronized server clocks unicast or manycast client, .Ic b : broadcast or multicast client, +.Ic p : +pool source, .Ic l : local (reference clock), .Ic s : diff --git a/ntpq/ntpq.html b/ntpq/ntpq.html index b84d2ff70..6f7f574b5 100644 --- a/ntpq/ntpq.html +++ b/ntpq/ntpq.html @@ -46,7 +46,7 @@ monitor the operational status and determine the performance of ntpd, the NTP daemon. -

This document applies to version 4.2.8p10 of ntpq. +

This document applies to version 4.2.8p11 of ntpq.

  • ntpq Description diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in index 49ddc0bb7..a23f5dc51 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@ "19 May 2017" "4.2.8p10" "User Commands" +.TH ntpq @NTPQ_MS@ "24 Jan 2018" "4.2.8p11" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 19, 2017 at 12:33:25 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 24, 2018 at 08:38:45 AM by AutoGen 5.18.5 .\" From the definitions ntpq-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -731,6 +731,8 @@ reference clocks, ..., 16 for unsynchronized server clocks unicast or manycast client, \f\*[B-Font]b\f[]: broadcast or multicast client, +\f\*[B-Font]p\f[]: +pool source, \f\*[B-Font]l\f[]: local (reference clock), \f\*[B-Font]s\f[]: diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in index 2b04e2161..b4d1757b3 100644 --- a/ntpq/ntpq.mdoc.in +++ b/ntpq/ntpq.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 19 2017 +.Dd January 24 2018 .Dt NTPQ @NTPQ_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpq-opts.mdoc) .\" -.\" It has been AutoGen-ed May 19, 2017 at 12:33:22 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 24, 2018 at 08:38:42 AM by AutoGen 5.18.5 .\" From the definitions ntpq-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -525,6 +525,8 @@ reference clocks, ..., 16 for unsynchronized server clocks unicast or manycast client, .Ic b : broadcast or multicast client, +.Ic p : +pool source, .Ic l : local (reference clock), .Ic s :