diff options
| author | Luke Howard <lukeh@padl.com> | 2008-12-29 14:40:52 +0000 |
|---|---|---|
| committer | Luke Howard <lukeh@padl.com> | 2008-12-29 14:40:52 +0000 |
| commit | 61874c699969965c4ab469904874699c9702a298 (patch) | |
| tree | 0814050e394335154da909f23a7fa3892ee692b0 | |
| parent | c5c953813ee5b7df105c66d084f0674c0dbb7589 (diff) | |
| download | krb5-61874c699969965c4ab469904874699c9702a298.zip krb5-61874c699969965c4ab469904874699c9702a298.tar.gz krb5-61874c699969965c4ab469904874699c9702a298.tar.bz2 | |
Don't omit ticket session key enctypes when negotiating enctypes
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mskrb-integ@21629 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/krb5/krb/rd_req_dec.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c index 10d1cc7..f774c48 100644 --- a/src/lib/krb5/krb/rd_req_dec.c +++ b/src/lib/krb5/krb/rd_req_dec.c @@ -406,11 +406,8 @@ krb5_rd_req_decoded_opt(krb5_context context, krb5_auth_context *auth_context, if ((*auth_context)->authentp->subkey != NULL) { desired_etypes[desired_etypes_len++] = (*auth_context)->authentp->subkey->enctype; } - if (rfc4537_etypes_len == 0) { - /* If EtypeList was present, omit the ticket session key enctypes */ - desired_etypes[desired_etypes_len++] = req->ticket->enc_part2->session->enctype; - desired_etypes[desired_etypes_len++] = req->ticket->enc_part.enctype; - } + desired_etypes[desired_etypes_len++] = req->ticket->enc_part2->session->enctype; + desired_etypes[desired_etypes_len++] = req->ticket->enc_part.enctype; desired_etypes[desired_etypes_len] = ENCTYPE_NULL; if (((*auth_context)->auth_context_flags & KRB5_AUTH_CONTEXT_PERMIT_ALL) == 0) { |