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

diff --git a/src/kadmin/v5server/srv_key.c b/src/kadmin/v5server/srv_key.c
index 394ea22f76b8eaed2612aa54dcf14d1c19de5a96..8a23fb883f428c013e6a4a1df31b0ab21154d10f 100644 (file)
--- 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,