From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 11 Aug 2003 01:52:49 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/backroom/ntp-stable
X-Git-Tag: NTP_4_2_0~15^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60df79290dbbbf085203c3cd96e26c0cd09a79c6;p=thirdparty%2Fntp.git

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

bk: 3f36f6f1maAsIQou9qmhIFstdvIrLA
---

60df79290dbbbf085203c3cd96e26c0cd09a79c6
diff --cc ntpq/ntpq.c
index e45a4af748,952c75f670..c1a53e85f9
--- a/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);
+ 	}
  }