[Bug 2630] Limit the ntpq command buffer to 512 bytes

bk: 53e9ad9dFUpUNBw9GO11eh_pi_R6Mw

diff --git a/ChangeLog b/ChangeLog
index 8667c820a9f2973a5936d1115bac635305431860..fd0d4b9b4eaec4af20c69f978d87ddb6b0c3a66d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2630] Limit the ntpq command buffer to 512 bytes.
 * FlexeLint cleanups.
 (4.2.7p458) 2014/08/11 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2633] Provide stdnoreturn.h for windows port.

diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi
index ebabd8454a3c4d135b33fe72a8cf56a20584fc78..399820aabb20a1e2043bf8927d9393f36572bb4b 100644 (file)
--- 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
+# It has been AutoGen-ed  August 12, 2014 at 12:01:59 AM by AutoGen 5.18.4pre14
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -778,7 +778,7 @@ Usage:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
    -6 no  ipv6           Force IPv6 DNS name resolution
                                 - prohibits the option 'ipv4'
    -c Str command        run a command and exit
-                                - may appear multiple times
+                                - may appear up to 512 times
    -d no  debug-level    Increase debug verbosity level
                                 - may appear multiple times
    -D Num set-debug-level Set the debug verbosity level
@@ -856,7 +856,7 @@ This option takes a string argument @file{cmd}.
 This option has some usage constraints.  It:
 @itemize @bullet
 @item
-may appear an unlimited number of times.
+may appear up to 512 times.
 @end itemize
 
 The following argument is interpreted as an interactive format command

diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index bd8585a2c1652f1dc7ad0142f75f7d7db0b6e098..2f9576dab0ad9b70f27d2f5b47026822baa74500 100644 (file)
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -369,7 +369,7 @@ static tOptDesc optDesc[OPTION_CT] = {
   {  /* entry idx, value */ 2, VALUE_OPT_COMMAND,
      /* equiv idx, value */ 2, VALUE_OPT_COMMAND,
      /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, NOLIMIT, 0,
+     /* min, max, act ct */ 0, 512, 0,
      /* opt state flags  */ COMMAND_FLAGS, 0,
      /* last opt argumnt */ { NULL }, /* --command */
      /* arg list/cookie  */ NULL,

diff --git a/ntpq/ntpq-opts.def b/ntpq/ntpq-opts.def
index ca72458a67f076f8d10d25b7fcc69ee68d352a5a..3028b6d2cb00ac592cda1ca05d0323989377a95e 100644 (file)
--- a/ntpq/ntpq-opts.def
+++ b/ntpq/ntpq-opts.def
@@ -39,7 +39,7 @@ flag = {
     value     = c;
     arg-type  = string;
     descrip   = "run a command and exit";
-    max       = NOLIMIT;
+    max       = 512;
     arg-name  = cmd;
     call-proc = ntpq_custom_opt_handler;
     doc = <<-  _EndOfDoc_

diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index 79d1024e729ff2767016bc51a1cc74ed656cffba..d101640e9436d7e1251f7e5263a60e800a80f6d2 100644 (file)
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -10,9 +10,9 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpq 1ntpqman "11 Aug 2014" "4.2.7p458" "User Commands"
+.TH ntpq 1ntpqman "12 Aug 2014" "4.2.7p458" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-KLaq8Y/ag-WLaq7Y)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-eqaqdV/ag-qqaqcV)
 .\"
 .\" It has been AutoGen-ed
 .\" From the definitions ntpq-opts.def
@@ -1172,7 +1172,7 @@ to the IPv6 namespace.
 .TP
 .NOP \f\*[B-Font]\-c\f[] \f\*[I-Font]cmd\f[], \f\*[B-Font]\-\-command\f[]=\f\*[I-Font]cmd\f[]
 run a command and exit.
-This option may appear an unlimited number of times.
+This option may appear up to 512 times.
 .sp
 The following argument is interpreted as an interactive format command
 and is added to the list of commands to be executed on the specified
@@ -1260,9 +1260,9 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
-.TH ntpq 1ntpqman "11 Aug 2014" "4.2.7p458" "User Commands"
+.TH ntpq 1ntpqman "12 Aug 2014" "4.2.7p458" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-KLaq8Y/ag-WLaq7Y)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-eqaqdV/ag-qqaqcV)
 .\"
 .\" It has been AutoGen-ed
 .\" From the definitions ntpq-opts.def

diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index 5a510090276709b2d67e378e422e98f8958788b4..8dc6ff32e145f7679b033ded1b27929da4551780 100644 (file)
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,4 +1,4 @@
-.Dd August 11 2014
+.Dd August 12 2014
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
@@ -759,7 +759,7 @@ Force DNS resolution of following host names on the command line
 to the IPv6 namespace.
 .It  Fl c Ar cmd , Fl \-command Ns = Ns Ar cmd 
 run a command and exit.
-This option may appear an unlimited number of times.
+This option may appear up to 512 times.
 .sp
 The following argument is interpreted as an interactive format command
 and is added to the list of commands to be executed on the specified

diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index 430d5a4914bbfb0b4129517b8df7fff8368c3024..a4c89ecc5e805c4589ab389a3ff95aa5e578a6de 100644 (file)
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -10,9 +10,9 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpq @NTPQ_MS@ "11 Aug 2014" "4.2.7p458" "User Commands"
+.TH ntpq @NTPQ_MS@ "12 Aug 2014" "4.2.7p458" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-KLaq8Y/ag-WLaq7Y)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-eqaqdV/ag-qqaqcV)
 .\"
 .\" It has been AutoGen-ed
 .\" From the definitions ntpq-opts.def
@@ -1172,7 +1172,7 @@ to the IPv6 namespace.
 .TP
 .NOP \f\*[B-Font]\-c\f[] \f\*[I-Font]cmd\f[], \f\*[B-Font]\-\-command\f[]=\f\*[I-Font]cmd\f[]
 run a command and exit.
-This option may appear an unlimited number of times.
+This option may appear up to 512 times.
 .sp
 The following argument is interpreted as an interactive format command
 and is added to the list of commands to be executed on the specified
@@ -1260,9 +1260,9 @@ the configuration files.
 The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP".
 If any of these are directories, then the file \fI.ntprc\fP
 is searched for within those directories.
-.TH ntpq @NTPQ_MS@ "11 Aug 2014" "4.2.7p458" "User Commands"
+.TH ntpq @NTPQ_MS@ "12 Aug 2014" "4.2.7p458" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-KLaq8Y/ag-WLaq7Y)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-eqaqdV/ag-qqaqcV)
 .\"
 .\" It has been AutoGen-ed
 .\" From the definitions ntpq-opts.def

diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index bc603ec18e4c1257c6e6c800f566cee3e4a0b3ef..6342d22ed25114ba5be52662db8ffe701b77dcfa 100644 (file)
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,4 +1,4 @@
-.Dd August 11 2014
+.Dd August 12 2014
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
@@ -759,7 +759,7 @@ Force DNS resolution of following host names on the command line
 to the IPv6 namespace.
 .It  Fl c Ar cmd , Fl \-command Ns = Ns Ar cmd 
 run a command and exit.
-This option may appear an unlimited number of times.
+This option may appear up to 512 times.
 .sp
 The following argument is interpreted as an interactive format command
 and is added to the list of commands to be executed on the specified