summaryrefslogtreecommitdiffstats
path: root/src/admin
diff options
context:
space:
mode:
authorJohn Kohl <jtkohl@mit.edu>1990-05-02 15:56:05 +0000
committerJohn Kohl <jtkohl@mit.edu>1990-05-02 15:56:05 +0000
commit5d517459f51d3bf660674d1abd141f8a3a82416b (patch)
tree2678abaeb9dec3497b74378164804410d7f21e8f /src/admin
parent394cb43be956b9bb04c79141f1c675ade6dd819f (diff)
add arg to fetch_mkey
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@674 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/admin')
-rw-r--r--src/admin/create/kdb5_create.c4
-rw-r--r--src/admin/stash/kdb5_stash.c3
2 files changed, 4 insertions, 3 deletions
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();