diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2002-03-07 01:43:09 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2002-03-07 01:43:09 +0000 |
| commit | 622c3b0be460fb68c140496ece6484562334ecfe (patch) | |
| tree | 25bf5a3bfb0b0377760e574307becbf9ab90eeb5 /src/lib | |
| parent | 0d8f5d73857ec0b9baa338a04ce790617ae8268d (diff) | |
| download | krb5-622c3b0be460fb68c140496ece6484562334ecfe.tar.gz krb5-622c3b0be460fb68c140496ece6484562334ecfe.tar.xz krb5-622c3b0be460fb68c140496ece6484562334ecfe.zip | |
* 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
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/keytab/srvtab/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/krb5/keytab/srvtab/kts_g_ent.c | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/krb5/keytab/srvtab/ChangeLog b/src/lib/krb5/keytab/srvtab/ChangeLog index aab09dc7ca..e16dda2643 100644 --- 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 e422c387fa..023724124b 100644 --- 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)) { |