diff options
| author | Sam Hartman <hartmans@mit.edu> | 2002-03-16 18:11:29 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2002-03-16 18:11:29 +0000 |
| commit | 57e9a3f23fc43ac466c4b0a7dc564559ac30aba6 (patch) | |
| tree | bf964168048f263faa39d10b99fe60b164d09e6f | |
| parent | 397739f8c019754acccd3f59cff4549fa34b2a12 (diff) | |
| download | krb5-57e9a3f23fc43ac466c4b0a7dc564559ac30aba6.zip krb5-57e9a3f23fc43ac466c4b0a7dc564559ac30aba6.tar.gz krb5-57e9a3f23fc43ac466c4b0a7dc564559ac30aba6.tar.bz2 | |
Fix merge from 1.2.2 branch to mainline
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14286 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/krb5/krb/fwd_tgt.c | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index b594d23..3d6aa46 100644 --- 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 06a1bcd..b3ee1aa 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 */ |