diff options
| author | Richard Basch <probe@mit.edu> | 1995-12-12 19:45:13 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1995-12-12 19:45:13 +0000 |
| commit | 69aa8f11de56ab42e17496e30125a82dc4fe6dec (patch) | |
| tree | 75cccb8abdbf24b64ddf2467335eab2a484dc476 /src | |
| parent | d32583334d261f4b472a220044d1bb440e256632 (diff) | |
| download | krb5-69aa8f11de56ab42e17496e30125a82dc4fe6dec.tar.gz krb5-69aa8f11de56ab42e17496e30125a82dc4fe6dec.tar.xz krb5-69aa8f11de56ab42e17496e30125a82dc4fe6dec.zip | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/kdb/fetch_mkey.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |