* kts_g_ent.c (krb5_ktsrvtab_get_entry): If a specific DES enctype was

requested, set the key's enctype to it, instead of always returning
des-cbc-crc.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14240 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/keytab/srvtab/ChangeLog b/src/lib/krb5/keytab/srvtab/ChangeLog
index aab09dc7ca2c57742769efb16881d596beba0f88..e16dda264351574a3d8ef688877c0d89dcbae39c 100644 (file)
--- a/src/lib/krb5/keytab/srvtab/ChangeLog
+++ b/src/lib/krb5/keytab/srvtab/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-06  Ken Raeburn  <raeburn@mit.edu>
+
+       * kts_g_ent.c (krb5_ktsrvtab_get_entry): If a specific DES enctype
+       was requested, set the key's enctype to it, instead of always
+       returning des-cbc-crc.
+
 2001-10-09  Ken Raeburn  <raeburn@mit.edu>
 
        * ktsrvtab.h: Make prototypes unconditional.
@@ -16,7 +22,6 @@ Fri Jan 28 19:53:44 2000  Ezra Peisach  <epeisach@mit.edu>
        * kts_g_ent.c, ktsrvtab.h (krb5_ktsrvtab_get_entry): Change the
        third argument to krb5_const_principal (from krb5_principal) to
        agree with krb5_kts_ops entries.
-       
 
 1999-10-26  Wilfredo Sanchez  <tritan@mit.edu>
 

diff --git a/src/lib/krb5/keytab/srvtab/kts_g_ent.c b/src/lib/krb5/keytab/srvtab/kts_g_ent.c
index e422c387fa11b3aefd8443ecf71c812eeded40a6..023724124babab77ef449255ed5676837b9352ee 100644 (file)
--- a/src/lib/krb5/keytab/srvtab/kts_g_ent.c
+++ b/src/lib/krb5/keytab/srvtab/kts_g_ent.c
@@ -65,6 +65,7 @@ krb5_ktsrvtab_get_entry(context, id, principal, kvno, enctype, entry)
     best_entry.vno = 0;
     best_entry.key.contents = 0;
     while ((kerror = krb5_ktsrvint_read_entry(context, id, &ent)) == 0) {
+       ent.key.enctype = enctype;
        if (krb5_principal_compare(context, principal, ent.principal)) {
            if (kvno == IGNORE_VNO) {
                if (!best_entry.principal || (best_entry.vno < ent.vno)) {