Merge whimsy.udel.edu:/backroom/ntp-stable

into whimsy.udel.edu:/backroom/ntp-dev

bk: 3f36f6f1maAsIQou9qmhIFstdvIrLA

diff --cc ntpq/ntpq.c
index e45a4af74827fd1bebe20f9f9ffd6756fb75a9f6,952c75f670b98b978e8bbee45171e63762fd88cc..c1a53e85f963c4b96bb5f9f0800f4ce273c37b26
--- 1/ntpq/ntpq.c
--- 2/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@@ -49,11 -43,12 +49,11 @@@ const char *prompt = "ntpq> ";     /* promp
  /*
   * Keyid used for authenticated requests.  Obtained on the fly.
   */
- u_long info_auth_keyid = NTP_MAXKEY;
+ u_long info_auth_keyid = 0;
  
  /*
 - * Type of key md5 or des
 + * Type of key md5
   */
 -#define       KEY_TYPE_DES    3
  #define       KEY_TYPE_MD5    4
  
  static        int info_auth_keytype = KEY_TYPE_MD5;   /* MD5 */
@@@ -1182,9 -1121,11 +1182,10 @@@ sendrequest
                                   "Invalid key identifier\n");
                                return 1;
                        }
+                       info_auth_keyid = keyid;
                }
                if (!authistrusted(info_auth_keyid)) {
 -                      pass = getpass((info_auth_keytype == KEY_TYPE_DES)
 -                          ? "DES Password: " : "MD5 Password: ");
 +                      pass = getpass("MD5 Password: ");
                        if (*pass == '\0') {
                                (void) fprintf(stderr,
                                  "Invalid password\n");
@@@ -2273,18 -2176,24 +2276,21 @@@ passwd
  {
        char *pass;
  
-       if (info_auth_keyid > NTP_MAXKEY) {
-               info_auth_keyid = getkeyid("Keyid: ");
-               if (info_auth_keyid > NTP_MAXKEY) {
-                       (void)fprintf(fp, "Keyid must be defined\n");
+       if (info_auth_keyid == 0) {
+               int keyid = getkeyid("Keyid: ");
+               if (keyid == 0 || keyid > NTP_MAXKEY) {
+                       (void)fprintf(fp, "Invalid key identifier\n");
                        return;
                }
+               info_auth_keyid = keyid;
        }
 -      pass = getpass((info_auth_keytype == KEY_TYPE_DES)
 -                     ? "DES Password: "
 -                     : "MD5 Password: "
 -                     );
 +      pass = getpass("MD5 Password: ");
        if (*pass == '\0')
            (void) fprintf(fp, "Password unchanged\n");
-       else
+       else {
            authusekey(info_auth_keyid, info_auth_keytype, (u_char *)pass);
+           authtrust(info_auth_keyid, 1);
+       }
  }