From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 29 Oct 2009 07:55:07 +0000 (-0500)
Subject: CID 101 and Bug 1359
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b7fff0eb72e991cd34657ecdb50f2677e55c4e3;p=thirdparty%2Fntp.git

CID 101 and Bug 1359

bk: 4ae94a5b0Vj9c4GeNyZWjszjzHwj5w
---

diff --git a/ChangeLog b/ChangeLog
index ce93820525..b5b7e1dc1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* [Bug 1359] Debug message cleanup.
+* CID 101: more pointer/array cleanup.
 * [Bug 1356] core dump from refclock_nmea when can't open /dev/gpsU.
 * [Bug 1358] AIX 4.3 sntp/networking.c IPV6_JOIN_GROUP undeclared.
 * CID 101: pointer/array cleanup.
diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c
index 0bcbb2341b..8534ef8622 100644
--- a/ntpd/ntp_crypto.c
+++ b/ntpd/ntp_crypto.c
@@ -3693,7 +3693,8 @@ crypto_setup(void)
 	 */
 	if (!RAND_status()) {
 		if (rand_file == NULL) {
-			RAND_file_name(rand_file, MAXFILENAME);
+			RAND_file_name(filename, MAXFILENAME);
+			rand_file = filename;
 		} else if (*rand_file != '/') {
 			snprintf(filename, MAXFILENAME, "%s/%s",
 			    keysdir, rand_file);
diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index 1d92595673..639c373ce1 100644
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -854,7 +854,8 @@ loop_config(
 	int i;
 
 #ifdef DEBUG
-	printf("loop_config: item %d freq %f\n", item, freq);
+	if (debug > 1)
+		printf("loop_config: item %d freq %f\n", item, freq);
 #endif
 	switch (item) {