Handle V4 salttype correctly

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

diff --git a/src/kadmin/v5server/srv_key.c b/src/kadmin/v5server/srv_key.c
index eed888f7aa5441e588da819a366ddaee1e910a39..37cdbf5731e2a4ba829a6d3e6ac66b5017d86507 100644 (file)
--- a/src/kadmin/v5server/srv_key.c
+++ b/src/kadmin/v5server/srv_key.c
@@ -672,8 +672,11 @@ key_string2key_keysalt(ksent, ptr)
         */
        if (!salted) {
            switch (kdata->key_data_type[1]) {
-           case KRB5_KDB_SALTTYPE_NORMAL:
            case KRB5_KDB_SALTTYPE_V4:
+               salt.length = 0;
+               salt.data = (char *) NULL;
+               break;
+           case KRB5_KDB_SALTTYPE_NORMAL:
                /* Normal salt */
                if (kret = krb5_principal2salt(argp->context,
                                               argp->dbentry->princ,
@@ -964,14 +967,15 @@ key_encrypt_keys(kcontext, dbentp, nkeysp, inkeys, outkeysp)
                else
                    break;
            }
+           else
+               salt.data.data = (char *) NULL;
+
            if (kret = krb5_dbekd_encrypt_key_data(kcontext,
                                                   &master_encblock,
                                                   &tmpkey,
-                                                  (salt.data.length) ?
-                                                       &salt :
-                                                       (krb5_keysalt *) NULL,
+                                                  &salt,
                                                   (int) inkeys[i].
-                                                       key_data_kvno,
+                                                      key_data_kvno,
                                                   &loser.key_data[i]))
                break;
            else