Modified krb5_db_fetch_mkey() to use the enctype in the stash file.

After making this modification 917 dejagnu tests pass (did not see any
failures on my Solaris test system).

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mkey_migrate@21771 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
index 48582d7247ee2aa68b76349c1257821e8a6324b7..ed92c510837959f4f9bb85c249b84b9101a19602 100644 (file)
--- a/src/kadmin/dbutil/kdb5_mkey.c
+++ b/src/kadmin/dbutil/kdb5_mkey.c
@@ -49,7 +49,7 @@ kdb5_add_mkey(int argc, char *argv[])
     krb5_kvno old_kvno, new_mkey_kvno;
     krb5_keyblock new_master_keyblock;
     krb5_key_data tmp_key_data, *old_key_data;
-    krb5_enctype new_master_enctype;
+    krb5_enctype new_master_enctype = ENCTYPE_UNKNOWN;
     char *new_mkey_password;
     krb5_db_entry master_entry;
     krb5_timestamp now;
@@ -65,7 +65,7 @@ kdb5_add_mkey(int argc, char *argv[])
     while ((optchar = getopt(argc, argv, "e:s")) != -1) {
         switch(optchar) {
         case 'e':
-            if (krb5_string_to_enctype(optarg, &global_params.enctype)) {
+            if (krb5_string_to_enctype(optarg, &new_master_enctype)) {
                 com_err(progname, EINVAL, ": %s is an invalid enctype", optarg);
                 exit_status++;
                 return;
@@ -81,7 +81,8 @@ kdb5_add_mkey(int argc, char *argv[])
         }
     }
 
-    new_master_enctype = global_params.enctype;
+    if (new_master_enctype == ENCTYPE_UNKNOWN)
+        new_master_enctype = global_params.enctype;
 
     /* assemble & parse the master key name */
     if ((retval = krb5_db_setup_mkey_name(util_context,
@@ -331,7 +332,8 @@ kdb5_add_mkey(int argc, char *argv[])
         }
     }
 
-    printf("i = %d old_key_data_count = %d\n", i, old_key_data_count);
+    /* XXX WAF: debug printf, remove before final commit */
+    /* printf("i = %d old_key_data_count = %d\n", i, old_key_data_count); */
     assert(i == old_key_data_count + 1);
 
     if ((retval = krb5_dbe_update_mkey_aux(util_context, &master_entry,
@@ -662,7 +664,7 @@ kdb5_list_mkeys(int argc, char *argv[])
                 asprintf(&output_str, "KNVO: %d, Enctype: %s, Active on: %s\n",
                          cur_kb_node->kvno, enctype, strdate(act_time));
             } else {
-                asprintf(&output_str, "KNVO: %d, Enctype: %s, Not activated\n",
+                asprintf(&output_str, "KNVO: %d, Enctype: %s, No activate time set\n",
                          cur_kb_node->kvno, enctype);
             }
         }

diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index ad04894a9e2a6f51d02b388e2e62f7040ecd89da..74353b0ab12049fdd88e9e78b70044e23c24dfbb 100644 (file)
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -474,8 +474,6 @@ static int open_db_and_mkey()
        mkey_password = 0;
 
     } else {
-        /* let the stash decide the enctype */
-        master_keyblock.enctype = ENCTYPE_UNKNOWN;
         if ((retval = krb5_db_fetch_mkey(util_context, master_princ, 
                                            master_keyblock.enctype,
                                            manual_mkey, FALSE,
@@ -508,7 +506,7 @@ static int open_db_and_mkey()
     }
 
     seed.length = master_keyblock.length;
-    seed.data = master_keyblock.contents;
+    seed.data = (char *) master_keyblock.contents;
 
     if ((retval = krb5_c_random_seed(util_context, &seed))) {
        com_err(progname, retval, "while seeding random number generator");

diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index 07c76abb32969c053d062e42a0316b8ae9c99eb6..fdc97840604a3f689950868a28e0cad67b059493 100644 (file)
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -1702,7 +1702,9 @@ krb5_db_fetch_mkey(krb5_context    context,
            goto clean_n_exit;
        }
 
-       tmp_key.enctype = key->enctype;
+        /* get the enctype from the stash */
+       tmp_key.enctype = ENCTYPE_UNKNOWN;
+
        retval = dal_handle->lib_handle->vftabl.fetch_master_key(context,
                                                                 mname,
                                                                 &tmp_key,