diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-05-13 17:35:40 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-05-13 17:35:40 +0000 |
| commit | 095f4cdf2236ddd39dc38cc4f8aa24c3f5e2fbfd (patch) | |
| tree | 0a88c696dcb62f9f6bf42e713ec0a0a3712c270c | |
| parent | c989a8d471be80e44ef582dbb138281739b1311b (diff) | |
| download | krb5-095f4cdf2236ddd39dc38cc4f8aa24c3f5e2fbfd.zip krb5-095f4cdf2236ddd39dc38cc4f8aa24c3f5e2fbfd.tar.gz krb5-095f4cdf2236ddd39dc38cc4f8aa24c3f5e2fbfd.tar.bz2 | |
At Luke's request, merge r24016 (fix negative enctype values in
keytabs) from trunk onto his camellia-ccm branch to facilitate
testing.
git-svn-id: svn://anonsvn.mit.edu/krb5/users/lhoward/camellia-ccm@24017 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/krb5/keytab/kt_file.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/krb5/keytab/kt_file.c b/src/lib/krb5/keytab/kt_file.c index 3583506..80070bc 100644 --- a/src/lib/krb5/keytab/kt_file.c +++ b/src/lib/krb5/keytab/kt_file.c @@ -1362,10 +1362,9 @@ krb5_ktfileint_internal_read_entry(krb5_context context, krb5_keytab id, krb5_ke error = KRB5_KT_END; goto fail; } - ret_entry->key.enctype = (krb5_enctype)enctype; - if (KTVERSION(id) != KRB5_KT_VNO_1) - ret_entry->key.enctype = ntohs(ret_entry->key.enctype); + enctype = ntohs(enctype); + ret_entry->key.enctype = (krb5_enctype)enctype; /* key contents */ ret_entry->key.magic = KV5M_KEYBLOCK; |