summaryrefslogtreecommitdiffstats
path: root/src/lib/krb5
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1996-01-11 02:17:17 +0000
committerTheodore Tso <tytso@mit.edu>1996-01-11 02:17:17 +0000
commit94cbabdd26bf9811ff589d959e74275fe8785644 (patch)
tree6fa032c7266ffde05ee399334ba5474dd977c790 /src/lib/krb5
parent06b31e632f9f56df7ced6edc4f4811e37f79dfbb (diff)
downloadkrb5-94cbabdd26bf9811ff589d959e74275fe8785644.tar.gz
krb5-94cbabdd26bf9811ff589d959e74275fe8785644.tar.xz
krb5-94cbabdd26bf9811ff589d959e74275fe8785644.zip
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
Diffstat (limited to 'src/lib/krb5')
-rw-r--r--src/lib/krb5/ccache/file/ChangeLog6
-rw-r--r--src/lib/krb5/ccache/file/fcc_read.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog
index 9d8e8662dc..43b2976dfd 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 41395f14f7..aa2cba8ea5 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);
}