From: Sam Hartman <hartmans@mit.edu>
Date: Thu, 1 Feb 1996 22:00:01 +0000 (+0000)
Subject: Remove check to make sure cached tickets are in tgs_enctypes
X-Git-Tag: krb5-1.0-beta6~535
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5fd0c388d114916e6d775e8f9ba40d95a6a2dc12;p=krb5.git

Remove check to make sure cached tickets are in tgs_enctypes

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

diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog
index 05a33d7e0..2628c31e7 100644
--- a/src/lib/krb5/ccache/file/ChangeLog
+++ b/src/lib/krb5/ccache/file/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb  1 15:45:23 1996  Sam Hartman  <hartmans@tertius.mit.edu>
+
+	* fcc_retrv.c (ktype_reasonable): removed.
+	(krb5_fcc_retrieve): Accept any enctype unless specific enctype is being matched.
+
 Wed Jan 24 21:36:34 1996  Sam Hartman  <hartmans@tertius.mit.edu>
 
 	* fcc_retrv.c (ktype_reasonable): Renamed ktype_match because it
diff --git a/src/lib/krb5/ccache/file/fcc_retrv.c b/src/lib/krb5/ccache/file/fcc_retrv.c
index 2e1bdf838..bda1b8791 100644
--- a/src/lib/krb5/ccache/file/fcc_retrv.c
+++ b/src/lib/krb5/ccache/file/fcc_retrv.c
@@ -68,29 +68,7 @@ register const krb5_data *data1, *data2;
 	return memcmp(data1->data, data2->data, data1->length) ? FALSE : TRUE;
 }
 
-static krb5_boolean
-ktype_reasonable(context, creds)
-register krb5_context context;
-register krb5_creds *creds;
-{
-    register int i;
-    krb5_enctype * ktypes = (krb5_enctype *) NULL;
-    krb5_enctype enctype = creds->keyblock.enctype;
-    krb5_principal princ = creds->server;
-
-    if (krb5_get_tgs_ktypes(context, princ, &ktypes))
-	return FALSE;
 
-    for (i=0; ktypes[i]; i++) {
-	if (ktypes[i] == enctype) {
-	    free(ktypes);
-	    return TRUE;
-	}
-    }
-
-    free(ktypes);
-    return FALSE;
-}
 
 /*
  * Effects:
@@ -157,8 +135,7 @@ krb5_fcc_retrieve(context, id, whichfields, mcreds, creds)
 	      (! set(KRB5_TC_MATCH_2ND_TKT) ||
 	       data_match (&mcreds->second_ticket, &fetchcreds.second_ticket))
 	      &&
-	     ((! set(KRB5_TC_MATCH_KTYPE)&&
-		      ktype_reasonable (context, &fetchcreds))||
+	     ((! set(KRB5_TC_MATCH_KTYPE))||
 		(mcreds->keyblock.enctype == fetchcreds.keyblock.enctype)))
 	  {
 	       krb5_fcc_end_seq_get(context, id, &cursor);