* fetch_mkey: Changed krb5_db_fetch_mkey() such that it will only try

		to set the enctype of the keyblock if the keyblock had it
		set to ENCTYPE_UNKNOWN.

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

diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c
index fc7e873f219022bbebc1f68c20a1a72c747177d9..5eda4eae6b45023e72cca8e4e6237f2452f4ead9 100644 (file)
--- a/src/lib/kdb/fetch_mkey.c
+++ b/src/lib/kdb/fetch_mkey.c
@@ -115,7 +115,7 @@ krb5_db_fetch_mkey(context, mname, eblock, fromkeyboard, twice, keyfile, salt, k
            retval = KRB5_KDB_CANTREAD_STORED;
            goto errout;
        }
-       if (key->enctype == NULL)
+       if (key->enctype == ENCTYPE_UNKNOWN)
            key->enctype = enctype;
        else if (enctype != key->enctype) {
            retval = KRB5_KDB_BADSTORED_MKEY;