PPS and crypto cleanup in ntp_proto.c from Dave Mills

bk: 49f292c8tWmdErXhVj7IrmNNHPdcSA

diff --git a/ChangeLog b/ChangeLog
index 617aef40112a81d603036f3db1a2abded3677d41..088d3515cd39c72043971c4c2dc97d59fefde7c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* PPS and crypto cleanup in ntp_proto.c from Dave Mills.
 (4.2.5p165) 2009/04/23 Released by Harlan Stenn <stenn@ntp.org>
 * WWVB refclock cleanup from Dave Mills.
 * Code cleanup: requested_key -> request_key.

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index b917a24b1994e56702cab6d4533ec0eae6fcbd12..3b4972ab16f45599fb23005d2f31b4d8086384e5 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2442,7 +2442,7 @@ clock_select(void)
                    high) && !(peer->flags & FLAG_TRUE))
                        continue;
 
-#ifdef HAVE_PPSAPI
+#ifdef REFCLOCK
                /*
                 * Elegible PPS peers must survive the intersection
                 * algorithm. Use the first one found, but don't
@@ -2453,7 +2453,7 @@ clock_select(void)
                                typepps = peer;
                        continue;
                }
-#endif /* HAVE_PPSAPI */
+#endif /* REFCLOCK */
 
                /*
                 * The metric is the scaled root distance plus the peer
@@ -2973,7 +2973,7 @@ peer_xmit(
                                    peer->assoc, NULL);
                        else if (peer->flags & FLAG_ASSOC)
                                exten = crypto_args(peer, CRYPTO_AUTO |
-                                   CRYPTO_RESP, peer->associd, NULL);
+                                   CRYPTO_RESP, peer->assoc, NULL);
 
                        /*
                         * Wait for clock sync, then sign the