ntp_config.c, ntp_peer.c, ntpq_ops.c:

  Dave did some cleanup and fixes.

bk: 38d6eeacDWmRJNCGPfdcyK783d-i-g

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 88581d5951db7f09c4f4e0df7e057eeaedb9dfbf..5965b91aedc4492fc876f275697519918aefb0f8 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -1308,27 +1308,39 @@ getconfig(
 
                    case CONFIG_CRYPTO:
                        crypto_enable = 1;
-                       for (i = 2; i < ntokens; i++) {
-                           switch (matchkey(tokens[i],
-                               crypto_keywords)) {
+                       for (i = 1; i < ntokens; i++) {
+                           int temp;
 
+                           temp = matchkey(tokens[i++], crypto_keywords);
+                           if (i > ntokens - 1) {
+                               msyslog(LOG_ERR,
+                                   "crypto: missing file name");
+                               errflg++;
+                               break;
+                           }
+                           switch(temp) {
                            case CONF_CRYPTO_FLAGS:
                                    crypto_config(CRYPTO_CONF_FLAGS,
-                                       tokens[i++]);
+                                       tokens[i]);
+                                   break;
 
                            case CONF_CRYPTO_DH:
                                    crypto_config(CRYPTO_CONF_DH,
-                                       tokens[i++]);
+                                       tokens[i]);
                                    break;
 
                            case CONF_CRYPTO_PRIVATEKEY:
                                    crypto_config(CRYPTO_CONF_PRIV,
-                                       tokens[i++]);
+                                       tokens[i]);
                                    break;
 
                            case CONF_CRYPTO_PUBLICKEY:
                                    crypto_config(CRYPTO_CONF_PUBL,
-                                       tokens[i++]);
+                                       tokens[i]);
+                                   break;
+                           default:
+                                   msyslog(LOG_ERR,
+                                       "crypto: unknown keyword");
                                    break;
                            }
                        }

diff --git a/ntpd/ntp_peer.c b/ntpd/ntp_peer.c
index 470a107f3334f67bb3a2ceca35a71755442cef95..d614d8e4887a0b897e3cf4ca9d9e4e0db3742da1 100644 (file)
--- a/ntpd/ntp_peer.c
+++ b/ntpd/ntp_peer.c
@@ -547,7 +547,7 @@ peer_config(
                    peer->keyid);
 #endif
 #ifdef PUBKEY
-       if (!(peer->flags & FLAG_SKEY))
+       if (!(peer->flags & FLAG_SKEY) || peer->hmode == MODE_BROADCAST)
                return (peer);
        crypto_public(peer, keystr);
 #endif /* PUBKEY */

diff --git a/ntpq/ntpq_ops.c b/ntpq/ntpq_ops.c
index 8827a84364445fe419951ecf989504ea47352472..8a8a961d809725d94c9f103db15fc36a6468ff36 100644 (file)
--- a/ntpq/ntpq_ops.c
+++ b/ntpq/ntpq_ops.c
@@ -940,7 +940,7 @@ printassoc(
                        conf = "yes";
                else
                        conf = "no";
-               if (statval & CTL_PST_REACH) {
+               if (statval & CTL_PST_REACH || 1) {
                        reach = "yes";
                        if (statval & CTL_PST_AUTHENABLE) {
                                if (statval & CTL_PST_AUTHENTIC)