From 57e9a3f23fc43ac466c4b0a7dc564559ac30aba6 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Sat, 16 Mar 2002 18:11:29 +0000 Subject: [PATCH] Fix merge from 1.2.2 branch to mainline git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14286 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/krb/ChangeLog | 5 +++++ src/lib/krb5/krb/fwd_tgt.c | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index b594d2306..3d6aa46f6 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,8 @@ +2002-03-16 Sam Hartman + + * fwd_tgt.c (krb5_fwd_tgt_creds): Fix merge of patch from 1.2.2 + back to mainline. + 2002-03-14 Sam Hartman * 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 06a1bcd4d..b3ee1aa0e 100644 --- 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 */ -- 2.26.2