* 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

diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index 199cf0c02469f3f2db2d5630b5efbe2ef78bf18a..93060ffeca0131ead89245e7b0f7e95b9bcf2f97 100644 (file)
--- 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 b45ab6fd766cc80308bc5ef0b9e5b8a87a1be0e9..159c95ca8fcf0f911cc95b484ab6c503c4d540c9 100644 (file)
--- 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