diff options
| author | Richard Basch <probe@mit.edu> | 1995-12-12 02:32:05 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1995-12-12 02:32:05 +0000 |
| commit | 3ea45cee5283e90976c44e763ccbd081b2c093af (patch) | |
| tree | 4785a1867a72370d9b71f20ef53c5be6c9a77c46 /src/lib/kdb | |
| parent | 56f09e077dcbc07331d4ca35d328dd433978f075 (diff) | |
| download | krb5-3ea45cee5283e90976c44e763ccbd081b2c093af.tar.gz krb5-3ea45cee5283e90976c44e763ccbd081b2c093af.tar.xz krb5-3ea45cee5283e90976c44e763ccbd081b2c093af.zip | |
* 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
Diffstat (limited to 'src/lib/kdb')
| -rw-r--r-- | src/lib/kdb/fetch_mkey.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c index 1197374ef6..fc7e873f21 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; } |