From 55ece37e84052d0a94ad6502333e90cf4eeb76f6 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Mon, 21 Feb 2000 21:39:11 +0000 Subject: [PATCH] from Bear Giles: * fetch_mkey.c (krb5_db_fetch_mkey): Don't attempt to override type of key read from stash file. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12061 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kdb/ChangeLog | 5 +++++ src/lib/kdb/fetch_mkey.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index 699e523e8..40884ad80 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,3 +1,8 @@ +2000-02-21 Bear Giles + + * fetch_mkey.c (krb5_db_fetch_mkey): Don't attempt to override + type of key read from stash file. + 2000-02-18 Tom Yu * kdb_cpw.c (krb5_dbe_crk): diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c index d9a742ff2..2ff5c2942 100644 --- a/src/lib/kdb/fetch_mkey.c +++ b/src/lib/kdb/fetch_mkey.c @@ -173,8 +173,6 @@ krb5_db_fetch_mkey(context, mname, etype, fromkeyboard, twice, keyfile, } else retval = 0; - key->enctype = etype; - errout: (void) fclose(kf); return retval; -- 2.26.2