From: Theodore Tso <tytso@mit.edu>
Date: Thu, 11 Jan 1996 02:17:17 +0000 (+0000)
Subject: If reading in a version 3 credentials cache, ignore the second enctype
X-Git-Tag: krb5-1.0-beta6~644
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=94cbabdd26bf9811ff589d959e74275fe8785644;p=krb5.git

If reading in a version 3 credentials cache, ignore the second enctype
stored in the ccache; just read it into a dummy variable.

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

diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog
index 9d8e8662d..43b2976df 100644
--- a/src/lib/krb5/ccache/file/ChangeLog
+++ b/src/lib/krb5/ccache/file/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jan 10 21:14:31 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* fcc_read.c (krb5_fcc_read_keyblock): If reading in a version 3
+		credentials cache, ignore the second enctype stored in the
+		ccache; just read it into a dummy variable.
+
 Thu Dec 21 18:28:09 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* fcc_maybe.c (krb5_fcc_open_file): In the case of
diff --git a/src/lib/krb5/ccache/file/fcc_read.c b/src/lib/krb5/ccache/file/fcc_read.c
index 41395f14f..aa2cba8ea 100644
--- a/src/lib/krb5/ccache/file/fcc_read.c
+++ b/src/lib/krb5/ccache/file/fcc_read.c
@@ -208,7 +208,7 @@ krb5_fcc_read_keyblock(context, id, keyblock)
      CHECK(kret);
      if (data->version == KRB5_FCC_FVNO_3) {
 	     kret = krb5_fcc_read_ui_2(context, id, &ui2);
-	     keyblock->enctype = ui2;
+	     /* keyblock->enctype = ui2; */
 	     CHECK(kret);
      }