[Bug 401] ntpdc: only ask for keyid once, from Jason Fountain

bk: 426f6123oenVGJZeylx1paX_KJGIwg

diff --git a/ntpdc/ntpdc.c b/ntpdc/ntpdc.c
index 3168596ea99b9238ffad63be994179c59e2373df..b037a85818522fe76514b33e7ddc9012aead20d1 100644 (file)
--- a/ntpdc/ntpdc.c
+++ b/ntpdc/ntpdc.c
@@ -873,13 +873,17 @@ sendrequest(
                    + MAX_MAC_LEN - sizeof(struct req_pkt_tail));
 
                if (info_auth_keyid == 0) {
-                       maclen = getkeyid("Keyid: ");
-                       if (maclen == 0) {
-                               (void) fprintf(stderr,
-                                   "Invalid key identifier\n");
-                               return 1;
+                       if (((struct conf_peer *)qpkt.data)->keyid > 0)
+                               info_auth_keyid = ((struct conf_peer *)qpkt.data)->keyid;
+                       else {
+                               maclen = getkeyid("Keyid: ");
+                               if (maclen == 0) {
+                                       (void) fprintf(stderr,
+                                           "Invalid key identifier\n");
+                                       return 1;
+                               }
+                               info_auth_keyid = maclen;
                        }
-                       info_auth_keyid = maclen;
                }
                if (!authistrusted(info_auth_keyid)) {
                        pass = getpass("MD5 Password: ");