From: Richard Basch <probe@mit.edu>
Date: Tue, 12 Dec 1995 02:32:05 +0000 (+0000)
Subject: 	* fetch_mkey.c: If the keyblock is initialized with an enctype of
X-Git-Tag: krb5-1.0-beta6~717
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ea45cee5283e90976c44e763ccbd081b2c093af;p=krb5.git

	* fetch_mkey.c: If the keyblock is initialized with an enctype of
		NULL, simply read in the enctype from the stash file and
		don't try to check it.

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

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