diff options
| author | Tom Yu <tlyu@mit.edu> | 2001-12-08 02:00:19 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2001-12-08 02:00:19 +0000 |
| commit | 0071c47e97514e8615edc2fa8e12c65ec5ee0171 (patch) | |
| tree | 4006080123e7a2849b6325af0e1d72f6c60f1723 /src/lib/krb5/keytab | |
| parent | 6a85ddebf1bb152f75938e8058f9bd38ba92045e (diff) | |
| download | krb5-0071c47e97514e8615edc2fa8e12c65ec5ee0171.tar.gz krb5-0071c47e97514e8615edc2fa8e12c65ec5ee0171.tar.xz krb5-0071c47e97514e8615edc2fa8e12c65ec5ee0171.zip | |
* ktf_g_ent.c (krb5_ktfile_get_entry): Coerce enctype for now to
restore 1.0.x enctype similarity behavior.
[pullup from 1.2.3]
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14060 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/keytab')
| -rw-r--r-- | src/lib/krb5/keytab/file/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/krb5/keytab/file/ktf_g_ent.c | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog index 199cf0c024..93060ffeca 100644 --- a/src/lib/krb5/keytab/file/ChangeLog +++ b/src/lib/krb5/keytab/file/ChangeLog @@ -1,3 +1,8 @@ +2001-11-19 Tom Yu <tlyu@mit.edu> + + * ktf_g_ent.c (krb5_ktfile_get_entry): Coerce enctype for now to + restore 1.0.x enctype similarity behavior. + 2001-10-09 Ken Raeburn <raeburn@mit.edu> * ktfile.h, ser_ktf.c: Make prototypes unconditional. diff --git a/src/lib/krb5/keytab/file/ktf_g_ent.c b/src/lib/krb5/keytab/file/ktf_g_ent.c index b45ab6fd76..159c95ca8f 100644 --- a/src/lib/krb5/keytab/file/ktf_g_ent.c +++ b/src/lib/krb5/keytab/file/ktf_g_ent.c @@ -81,6 +81,14 @@ krb5_ktfile_get_entry(context, id, principal, kvno, enctype, entry) krb5_kt_free_entry(context, &new_entry); continue; } + /* + * Coerce the enctype of the output keyblock in case we + * got an inexact match on the enctype; this behavior will + * go away when the key storage architecture gets + * redesigned for 1.3. + */ + new_entry.key.enctype = enctype; + } /* if the principal isn't the one requested, free new_entry |