CID 101 and Bug 1359

bk: 4ae94a5b0Vj9c4GeNyZWjszjzHwj5w

diff --git a/ChangeLog b/ChangeLog
index ce93820525161f8dc4a538a6f8f4f3224ea1c773..b5b7e1dc1a63782e325be6c29731cc4cc2549c6b 100644 (file)
--- 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 0bcbb2341b63bdcfbd43ea7fc470c5005c43b95d..8534ef8622eb3adb856f68db6da91d58c530eb57 100644 (file)
--- 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 1d92595673aa6cc897efd101b0082ae2149d9cb3..639c373ce12f399b76b0fe24d19b4838d6fbd6d9 100644 (file)
--- 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) {