ChangeLog, ntp_peer.c:

  * ntpd/ntp_peer.c (unpeer): Moved keystr cleanup inside ifdef PUBKEY

bk: 395cec9av86UmNnkqUaXOG38goze0A

diff --git a/ChangeLog b/ChangeLog
index 34925774b5fd17321dd6585c05c927d99c7ae63c..8804131e28e4564a98534355c85a00db3874a5c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-06-30  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * ntpd/ntp_peer.c (unpeer): Moved keystr cleanup inside ifdef PUBKEY
+
        * configure.in: 4.0.99j3
 
        * html/release.htm: 

diff --git a/ntpd/ntp_peer.c b/ntpd/ntp_peer.c
index 8c77b89fd28c94c88a84ffa5f7b6b53757d29518..1ef66ece4a664e69f1a3ec3bc1869865b1e4dd01 100644 (file)
--- a/ntpd/ntp_peer.c
+++ b/ntpd/ntp_peer.c
@@ -440,9 +440,9 @@ unpeer(
                    peer_associations);
 #endif
        peer_clear(peer_to_remove);
+#ifdef PUBKEY
        if (peer_to_remove->keystr != NULL)
                free(peer_to_remove->keystr);
-#ifdef PUBKEY
        if (peer_to_remove->pubkey != NULL)
                free(peer_to_remove->pubkey);
 #endif /* PUBKEY */