pull up r17420 from trunk

ticket: 3205
version_fixed: 1.4.3

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17429 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 2774ff00eb04617e4ee5061295d1109e03289e4c..a53b78ca1132eb4b49616709ecf98a45be81dc5c 100644 (file)
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-12  Tom Yu  <tlyu@mit.edu>
+
+       * kdc_preauth.c (return_etype_info2): Apply patch from Will
+       Fiveash to use reply key's enctype, not the long-term key's
+       enctype, to avoid some enctype similarity problems.
+
 2005-07-12  Tom Yu  <tlyu@mit.edu>
 
        * do_as_req.c (prepare_error_as):

diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c
index da7ddfa56a4167f301ab46c1dc558fc2b6d98b8f..e2ffe255b3a4f7e9204cf679aebadde4ecb5fbcf 100644 (file)
--- a/src/kdc/kdc_preauth.c
+++ b/src/kdc/kdc_preauth.c
@@ -771,7 +771,8 @@ return_etype_info2(krb5_context context, krb5_pa_data * padata,
     }
     entry[0] = NULL;
     entry[1] = NULL;
-    retval = _make_etype_info_entry(context, request, client_key, client_key->key_data_type[0],
+    retval = _make_etype_info_entry(context, request,
+                                   client_key, encrypting_key->enctype,
                                    entry, 1);
     if (retval)
        goto cleanup;