2004-07-07 Jeffrey Altman <jaltman@mit.edu>

 * cc_mslsa.c:  When obtaining a TGT from the MSLSA, do not ignore the
   cache when the requested enctype is the NULL enctype.  This means to
   accept any enctype.

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

diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 19e9add2aa62a6a0072f6735a47f41b5a3578398..a239e0b4abf5be37a013163847d72c44f5976ebc 100644 (file)
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-07  Jeffrey Altman <jaltman@mit.edu>
+
+    * cc_mslsa.c:  When obtaining a TGT from MSLSA, do not ignore 
+      the cache if the requested enctype is the NULL enctype.
+
 2004-06-30  Ken Raeburn  <raeburn@mit.edu>
 
        * cc_file.c (krb5_fcc_data): Added a mutex.

diff --git a/src/lib/krb5/ccache/cc_mslsa.c b/src/lib/krb5/ccache/cc_mslsa.c
index 3ab99cfec9a3847ec55e8077e4c0fd6e2f66b627..8fd278ec1afe2d5a01fe4212d31c40d9de1af5d7 100644 (file)
--- a/src/lib/krb5/ccache/cc_mslsa.c
+++ b/src/lib/krb5/ccache/cc_mslsa.c
@@ -850,6 +850,7 @@ GetMSTGT(krb5_context context, HANDLE LogonHandle, ULONG PackageId, KERB_EXTERNA
 #else
         /* Check Supported Enctypes */
         if ( !enforce_tgs_enctypes ||
+             pTicketResponse->Ticket.SessionKey.KeyType == KERB_ETYPE_NULL ||
              krb5_is_permitted_tgs_enctype(context, NULL, pTicketResponse->Ticket.SessionKey.KeyType) ) {
             FILETIME Now, MinLife, EndTime, LocalEndTime;
             __int64  temp;