From: Richard Basch <probe@mit.edu>
Date: Tue, 12 Dec 1995 19:45:13 +0000 (+0000)
Subject: 	* fetch_mkey: Changed krb5_db_fetch_mkey() such that it will only try
X-Git-Tag: krb5-1.0-beta6~704
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=69aa8f11de56ab42e17496e30125a82dc4fe6dec;p=krb5.git

	* 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 fc7e873f2..5eda4eae6 100644
--- 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;