From: Dave Hart <hart@ntp.org>
Date: Tue, 17 Nov 2009 07:27:53 +0000 (+0000)
Subject: [Bug 1384] ntpq :config core dumped with a blank password.
X-Git-Tag: NTP_4_2_5P246_RC~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b1a021ad46e391b2e0deef523cd2f2e11c8678a;p=thirdparty%2Fntp.git

[Bug 1384] ntpq :config core dumped with a blank password.

bk: 4b025079ndkkhC3F4WW1nNRHURnTEw
---

diff --git a/ChangeLog b/ChangeLog
index b97ba7410..77e16f0d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 * [Bug 1378] Unnecessary resetting of peers during interface update.
 * [Bug 1382] p245 configure --disable-dependency-tracking won't build.
+* [Bug 1384] ntpq :config core dumped with a blank password.
 (4.2.5p245-RC) 2009/11/14 Released by Harlan Stenn <stenn@ntp.org>
 * Cleanup from Dave Mills.
 * [Bug 1343] sntp illegal C does not compile on Solaris 7.
diff --git a/ntpq/ntpq-subs.c b/ntpq/ntpq-subs.c
index 3c1b31384..c016c79a7 100644
--- a/ntpq/ntpq-subs.c
+++ b/ntpq/ntpq-subs.c
@@ -19,7 +19,7 @@ int 	maxhostlen;
 /*
  * Declarations for command handlers in here
  */
-static	int checkassocid	(u_int32);
+static	int	checkassocid	(u_int32);
 static	struct varlist *findlistvar (struct varlist *, char *);
 static	void	doaddvlist	(struct varlist *, char *);
 static	void	dormvlist	(struct varlist *, char *);
@@ -1869,6 +1869,9 @@ config (
 	res = doquery(CTL_OP_CONFIGURE, 0, 1, strlen(cfgcmd), cfgcmd,
 		      &rstatus, &rsize, &rdata);
 
+	if (res != 0)
+		return;
+
 	if (rsize > 0 && '\n' == rdata[rsize - 1])
 		rsize--;
 	rdata[rsize] = '\0';
@@ -1908,44 +1911,60 @@ config_from_file (
 	FILE *fp
 	)
 {
-    u_short rstatus;
-    int rsize;
-    char *rdata;
-    int res;
-    FILE *config_fd;
-    char config_cmd[MAXLINE];
-    size_t config_len;
-
-    if (debug > 2) {
-        printf("In Config\n");
-        printf("Keyword = %s\n", pcmd->keyword);
-        printf("Filename = %s\n", pcmd->argval[0].string);
-    }
-
-    if ((config_fd = fopen(pcmd->argval[0].string, "r")) == NULL) {
-        printf("ERROR!! Couldn't open file: %s\n", pcmd->argval[0].string);
-    } 
-    else {
-        int i = 0;
-        printf("Sending configuration file, one line at a time.\n");
-        while (fgets(config_cmd, MAXLINE, config_fd) != NULL) {
-	    config_len = strlen(config_cmd);
-	    /* ensure even the last line has newline, if possible */
-	    if (config_len > 0 && config_len + 2 < sizeof(config_cmd)
-		&& '\n' != config_cmd[config_len - 1])
-		    config_cmd[config_len++] = '\n';
-            ++i;
-            res = doquery(CTL_OP_CONFIGURE, 0, 1, strlen(config_cmd),
-                          config_cmd, &rstatus,
-                          &rsize, &rdata);
-	    if (rsize > 0 && '\n' == rdata[rsize - 1])
-		    rsize--;
-	    if (rsize > 0 && '\r' == rdata[rsize - 1])
-		    rsize--;
-            rdata[rsize] = '\0';
-	    printf("Line No: %d %s: %s", i, rdata, config_cmd);
-        }
-        printf("Done sending file\n");
-        fclose(config_fd);
-    }
+	u_short rstatus;
+	int rsize;
+	char *rdata;
+	int res;
+	FILE *config_fd;
+	char config_cmd[MAXLINE];
+	size_t config_len;
+	int i;
+	int retry_limit;
+
+	if (debug > 2) {
+		printf("In Config\n");
+		printf("Keyword = %s\n", pcmd->keyword);
+		printf("Filename = %s\n", pcmd->argval[0].string);
+	}
+
+	config_fd = fopen(pcmd->argval[0].string, "r");
+	if (NULL == config_fd) {
+		printf("ERROR!! Couldn't open file: %s\n",
+		       pcmd->argval[0].string);
+		return;
+	}
+
+	printf("Sending configuration file, one line at a time.\n");
+	i = 0;
+	while (fgets(config_cmd, MAXLINE, config_fd) != NULL) {
+		config_len = strlen(config_cmd);
+		/* ensure even the last line has newline, if possible */
+		if (config_len > 0 && 
+		    config_len + 2 < sizeof(config_cmd) &&
+		    '\n' != config_cmd[config_len - 1])
+			config_cmd[config_len++] = '\n';
+		++i;
+		retry_limit = 2;
+		do 
+			res = doquery(CTL_OP_CONFIGURE, 0, 1,
+				      strlen(config_cmd), config_cmd,
+				      &rstatus, &rsize, &rdata);
+		while (res != 0 && retry_limit--);
+		if (res != 0) {
+			printf("Line No: %d query failed: %s", i,
+			       config_cmd);
+			printf("Subsequent lines not sent.\n");
+			fclose(config_fd);
+			return;
+		}
+
+		if (rsize > 0 && '\n' == rdata[rsize - 1])
+			rsize--;
+		if (rsize > 0 && '\r' == rdata[rsize - 1])
+			rsize--;
+		rdata[rsize] = '\0';
+		printf("Line No: %d %s: %s", i, rdata, config_cmd);
+	}
+	printf("Done sending file\n");
+	fclose(config_fd);
 }