ChangeLog, ntp_proto.c:

  * ntpd/ntp_proto.c (peer_xmit): PUBKEY cleanup

bk: 3976292bT04AwjebJWmymqJheUhdhw

diff --git a/ChangeLog b/ChangeLog
index ba206608992cb9b395c720ae532e037353b36ce1..e33a952889dd3e7e2ee9a2d8a4285d9a808ac071 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-19  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * ntpd/ntp_proto.c (peer_xmit): PUBKEY cleanup
+
 2000-07-18  Harlan Stenn  <stenn@whimsy.udel.edu>
 
        * configure.in: 4.0.99j5

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 804c5b692bb28f4bec60099eee7abc1852122a98..c5a198d6d14fd0c7aa112636bdd1a389d2afaf6d 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2013,11 +2013,13 @@ peer_xmit(
                                sendlen += crypto_xmit((u_int32 *)&xpkt,
                                    sendlen, CRYPTO_AUTO | CRYPTO_RESP,
                                    peer->hcookie, peer->associd);
+#ifdef PUBKEY
                        else if (crypto_flags & CRYPTO_FLAG_TAI &&
                            sys_tai == 0)
                                sendlen += crypto_xmit((u_int32 *)&xpkt,
                                    sendlen, CRYPTO_TAI, peer->hcookie,
                                    peer->assoc);
+#endif /* PUBKEY */
                        peer->cmmd = 0;
                        break;
 
@@ -2053,11 +2055,13 @@ peer_xmit(
                                sendlen += crypto_xmit((u_int32 *)&xpkt,
                                    sendlen, CRYPTO_AUTO, peer->hcookie,
                                    peer->assoc);
+#ifdef PUBKEY
                        else if (crypto_flags & CRYPTO_FLAG_TAI &&
                            sys_tai == 0)
                                sendlen += crypto_xmit((u_int32 *)&xpkt,
                                    sendlen, CRYPTO_TAI, peer->hcookie,
                                    peer->assoc);
+#endif /* PUBKEY */
                        peer->cmmd = 0;
                        break;
                }