From: John Kohl <jtkohl@mit.edu>
Date: Wed, 2 May 1990 15:56:05 +0000 (+0000)
Subject: add arg to fetch_mkey
X-Git-Tag: krb5-1.0-alpha2~722
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d517459f51d3bf660674d1abd141f8a3a82416b;p=krb5.git

add arg to fetch_mkey

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@674 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/admin/create/kdb5_create.c b/src/admin/create/kdb5_create.c
index 001a4a91a..fef0c261c 100644
--- a/src/admin/create/kdb5_create.c
+++ b/src/admin/create/kdb5_create.c
@@ -214,8 +214,8 @@ master key name '%s'\n",
     printf("It is important that you NOT FORGET this password.\n");
     fflush(stdout);
 
-    /* TRUE here means read the keyboard */
-    if (retval = krb5_db_fetch_mkey(master_princ, &master_encblock, TRUE,
+    /* TRUE here means read the keyboard, and do it twice */
+    if (retval = krb5_db_fetch_mkey(master_princ, &master_encblock, TRUE, TRUE,
 				    &master_keyblock)) {
 	com_err(argv[0], retval, "while reading master key");
 	exit(1);
diff --git a/src/admin/stash/kdb5_stash.c b/src/admin/stash/kdb5_stash.c
index 253c51155..d9394aedf 100644
--- a/src/admin/stash/kdb5_stash.c
+++ b/src/admin/stash/kdb5_stash.c
@@ -153,8 +153,9 @@ char *argv[];
 	exit(1);
     }
 
-    /* TRUE here means read the keyboard */
+    /* TRUE here means read the keyboard, but only once */
     if (retval = krb5_db_fetch_mkey(master_princ, &master_encblock, TRUE,
+				    FALSE,
 				    &master_keyblock)) {
 	com_err(argv[0], retval, "while reading master key");
 	(void) krb5_db_fini();