From 3ea45cee5283e90976c44e763ccbd081b2c093af Mon Sep 17 00:00:00 2001 From: Richard Basch Date: Tue, 12 Dec 1995 02:32:05 +0000 Subject: [PATCH] * 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 --- src/lib/kdb/fetch_mkey.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; } -- 2.26.2