From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 28 Feb 2014 07:29:49 +0000 (-0500)
Subject: [Bug 2113] Warn about ignored extra args in ntpq
X-Git-Tag: NTP_4_2_7P426~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e7e4fd3571e94126f6f271e8f558c8d5359b40f;p=thirdparty%2Fntp.git

[Bug 2113] Warn about ignored extra args in ntpq

bk: 53103aedhSHSxo7W0VlvAMKDAZUYEQ
---

diff --git a/ChangeLog b/ChangeLog
index 98689be56..bacbffee1 100644
--- 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 a299e7817..fa819eb60 100644
--- 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++ = ',';