[Bug 2113] Warn about ignored extra args in ntpq

bk: 53103aedhSHSxo7W0VlvAMKDAZUYEQ

diff --git a/ChangeLog b/ChangeLog
index 98689be560646fe808bcf7f070062b2afc68f66f..bacbffee198c322070d0dd9ffc4478394aa95d88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2113] Warn about ignored extra args in ntpq.
 * [Bug 2561] Allow wildcards in the target of the "interface" command.
 (4.2.7p425) 2014/02/26 Released by Harlan Stenn <stenn@ntp.org>
 * Copyright file update.

diff --git a/ntpq/ntpq-subs.c b/ntpq/ntpq-subs.c
index a299e7817583a76afcd9f6e7d90d637785832f12..fa819eb60c6f86bccb92c38bc23c1654b7c2f733 100644 (file)
--- a/ntpq/ntpq-subs.c
+++ b/ntpq/ntpq-subs.c
@@ -210,7 +210,7 @@ struct xcmd opcmds[] = {
  * Variable list data space
  */
 #define MAXLINE                512     /* maximum length of a line */
-#define MAXLIST                64      /* maximum variables in list */
+#define MAXLIST                128     /* maximum variables in list */
 #define LENHOSTNAME    256     /* host name limit */
 
 #define MRU_GOT_COUNT  0x1
@@ -536,8 +536,12 @@ makequerydata(
                else
                        valuelen = strlen(vl->value);
                totallen = namelen + valuelen + (valuelen != 0) + (cp != data);
-               if (cp + totallen > cpend)
-                       break;
+               if (cp + totallen > cpend) {
+                   fprintf(stderr, 
+                           "***Ignoring variables starting with `%s'\n",
+                           vl->name);
+                   break;
+               }
 
                if (cp != data)
                        *cp++ = ',';