Fix merge from 1.2.2 branch to mainline

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index b594d2306fae8957b46b136d96840aa4f3e913cc..3d6aa46f62d66987f91064f4ed702a6afd1a1415 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-16  Sam Hartman  <hartmans@mit.edu>
+
+       * fwd_tgt.c (krb5_fwd_tgt_creds): Fix merge of patch from 1.2.2
+       back to mainline. 
+
 2002-03-14  Sam Hartman  <hartmans@mit.edu>
 
        * walk_rtree.c (krb5_walk_realm_tree):  Fix handling of null client or server realm

diff --git a/src/lib/krb5/krb/fwd_tgt.c b/src/lib/krb5/krb/fwd_tgt.c
index 06a1bcd4da357e3683baa7628b937bd7cf6dbebb..b3ee1aa0e73acf63a984411d505623c3488c46c0 100644 (file)
--- a/src/lib/krb5/krb/fwd_tgt.c
+++ b/src/lib/krb5/krb/fwd_tgt.c
@@ -148,7 +148,6 @@ krb5_fwd_tgt_creds(context, auth_context, rhost, client, server, cc,
     creds.keyblock.enctype = enctype;
     creds.times = tgt.times;
     creds.times.starttime = 0;
-    creds.keyblock.enctype = tgt.keyblock.enctype;
     kdcoptions = flags2options(tgt.ticket_flags)|KDC_OPT_FORWARDED;
 
     if (!forwardable) /* Reset KDC_OPT_FORWARDABLE */