summaryrefslogtreecommitdiffstats
path: root/src/kadmin/v5server
diff options
context:
space:
mode:
authorPaul Park <pjpark@mit.edu>1995-05-11 16:23:30 +0000
committerPaul Park <pjpark@mit.edu>1995-05-11 16:23:30 +0000
commitfcec24792dd8a2c37994b86bfacf9ce967db15ae (patch)
tree4c31ba84518aaea6fa8c30443184be2035d1676e /src/kadmin/v5server
parentf8604c5c36684cd26855231006ab59d36256bd6b (diff)
downloadkrb5-fcec24792dd8a2c37994b86bfacf9ce967db15ae.tar.gz
krb5-fcec24792dd8a2c37994b86bfacf9ce967db15ae.tar.xz
krb5-fcec24792dd8a2c37994b86bfacf9ce967db15ae.zip
Avoid a core dump when the master key is entered incorrectly
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5797 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/v5server')
-rw-r--r--src/kadmin/v5server/srv_key.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kadmin/v5server/srv_key.c b/src/kadmin/v5server/srv_key.c
index 394ea22f7..8a23fb883 100644
--- a/src/kadmin/v5server/srv_key.c
+++ b/src/kadmin/v5server/srv_key.c
@@ -222,8 +222,6 @@ key_init(kcontext, debug_level, enc_type, key_type, master_key_name, manual,
error_message(kret));
goto cleanup;
}
- mencb_init = 1;
- mkeyb_init = 1;
/* Verify the master key */
if (kret = krb5_db_verify_master_key(kcontext,
@@ -242,6 +240,8 @@ key_init(kcontext, debug_level, enc_type, key_type, master_key_name, manual,
fprintf(stderr, key_key_pp_fmt, programname, error_message(kret));
goto leave;
}
+ mencb_init = 1;
+ mkeyb_init = 1;
/* Now initialize the random key */
kret = krb5_init_random_key(kcontext,