summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Altman <jaltman@secure-endpoints.com>2004-07-07 12:05:03 +0000
committerJeffrey Altman <jaltman@secure-endpoints.com>2004-07-07 12:05:03 +0000
commitacdf69daf088563d1fcf4f19efafc3ef1d008d92 (patch)
tree31a3d5f4a734a45f0a16e098be08ebb8e1a5ec4f
parent42f19bf45bce9469b0c14944ad4c7a2ed26bdd39 (diff)
downloadkrb5-acdf69daf088563d1fcf4f19efafc3ef1d008d92.tar.gz
krb5-acdf69daf088563d1fcf4f19efafc3ef1d008d92.tar.xz
krb5-acdf69daf088563d1fcf4f19efafc3ef1d008d92.zip
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
-rw-r--r--src/lib/krb5/ccache/ChangeLog5
-rw-r--r--src/lib/krb5/ccache/cc_mslsa.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 19e9add2a..a239e0b4a 100644
--- 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 3ab99cfec..8fd278ec1 100644
--- 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;