More cleanup of fix for Bug 1320

bk: 50a2dcc1lByJNE62F9xA2NYMoejeYw

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 6a8f78003949863291e547b26787c4760669e68b..577a4e3c9d388d8dd42dafb233e309032f93b3ec 100644 (file)
--- 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);
        }
 
        /*