Remove 'calldelay' and 'sign' keywords (Dave Mills)

bk: 4cb7f3b7Gsm5wf5zxnyVwaFuIpWYYA

diff --git a/ChangeLog b/ChangeLog
index d926abe0003d712ab78a7729e75fa9fb77fbe651..a9f32ac26e6da98d2ee25911d85a0f7cea9ff6de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 * [Bug 1663] ntpdsim should not open net sockets.
 * [Bug 1665] from 4.2.6p3: is_anycast() u_int32_t should be u_int32.
 * from 4.2.6p3: ntpsnmpd, libntpq warning cleanup.
+* Remove 'calldelay' and 'sign' keywords (Dave Mills).
 * Documentation updates from Dave Mills.
 (4.2.7p63) 2010/10/13 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1080] from 4.2.6p3-RC3: ntpd on ipv6 routers very chatty.

diff --git a/include/ntp_crypto.h b/include/ntp_crypto.h
index 5d8dbdb2693fe32da349ca32795b3998e2b444d9..bba39e1c1de70a96dbc49fa7af091ee2a76d71e7 100644 (file)
--- a/include/ntp_crypto.h
+++ b/include/ntp_crypto.h
@@ -8,16 +8,15 @@
  * Configuration codes (also needed for parser without AUTOKEY)
  */
 #define CRYPTO_CONF_NONE  0    /* nothing doing */
-#define CRYPTO_CONF_PRIV  1    /* host keys file name */
-#define CRYPTO_CONF_SIGN  2    /* signature keys file name */
+#define CRYPTO_CONF_PRIV  1    /* host name */
+#define CRYPTO_CONF_IDENT 2    /* group name */
 #define CRYPTO_CONF_CERT  3    /* certificate file name */
 #define CRYPTO_CONF_RAND  4    /* random seed file name */
 #define CRYPTO_CONF_IFFPAR 5   /* IFF parameters file name */
 #define CRYPTO_CONF_GQPAR 6    /* GQ parameters file name */
 #define        CRYPTO_CONF_MVPAR 7     /* MV parameters file name */
 #define CRYPTO_CONF_PW   8     /* private key password */
-#define        CRYPTO_CONF_IDENT 9     /* specify identity scheme */
-#define        CRYPTO_CONF_NID   10    /* specify digest name */
+#define        CRYPTO_CONF_NID   9     /* specify digest name */
 
 #ifdef AUTOKEY
 #ifndef OPENSSL

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 625e2fa7ec13d0505a52366ccd4d2e19a9e4627b..d4b7892acc0fcd4b83a515bd9ffe2b666a380af0 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -1797,10 +1797,6 @@ config_auth(
                        item = CRYPTO_CONF_RAND;
                        break;
 
-               case T_Sign:
-                       item = CRYPTO_CONF_SIGN;
-                       break;
-
                case T_Digest:
                        item = CRYPTO_CONF_NID;
                        break;
@@ -1863,7 +1859,7 @@ config_auth(
 #ifdef AUTOKEY
        /* crypto revoke command */
        if (ptree->auth.revoke)
-               sys_revoke = ptree->auth.revoke;
+               sys_revoke = 1 << ptree->auth.revoke;
 #endif /* AUTOKEY */
 }