From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 13 Nov 2012 23:50:25 +0000 (-0500)
Subject: More cleanup of fix for Bug 1320
X-Git-Tag: NTP_4_2_7P322~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c94b7f92e7e7b145bc80ec492b7c36dd223a034;p=thirdparty%2Fntp.git

More cleanup of fix for Bug 1320

bk: 50a2dcc1lByJNE62F9xA2NYMoejeYw
---

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 6a8f78003..577a4e3c9 100644
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -485,15 +485,19 @@ ntpdmain(
 
 	{
 		int i;
-		char buf[4096];
+		char buf[1024];	/* Secret knowledge of msyslog buf length */
 		char *cp = buf;
 
+		/* Note that every arg has an initial space character */
+		snprintf(cp, sizeof(buf), "Command line:");
+		cp += strlen(cp);
+
 		for (i = 0; i < saved_argc ; ++i) {
-			snprintf(cp, sizeof buf - (cp - buf),
-				"%s%s", &" "[(cp == buf)], saved_argv[i]);
+			snprintf(cp, sizeof(buf) - (cp - buf),
+				" %s", saved_argv[i]);
 			cp += strlen(cp);
 		}
-		msyslog(LOG_NOTICE, "Command line: %s", buf);
+		msyslog(LOG_NOTICE, "%s", buf);
 	}
 
 	/*