svn rev #21629: branches/mskrb-integ/src/lib/krb5/krb/

[lhoward@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21629
Commit By: lhoward
Log Message:
Don't omit ticket session key enctypes when negotiating enctypes.



Changed Files:
U   branches/mskrb-integ/src/lib/krb5/krb/rd_req_dec.c
Modified: branches/mskrb-integ/src/lib/krb5/krb/rd_req_dec.c
===================================================================
--- branches/mskrb-integ/src/lib/krb5/krb/rd_req_dec.c	2008-12-29 13:54:47 UTC (rev 21628)
+++ branches/mskrb-integ/src/lib/krb5/krb/rd_req_dec.c	2008-12-29 14:40:52 UTC (rev 21629)
@@ -406,11 +406,8 @@
     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) {