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

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 699e523e8ecd77569a010723200962bf60b7c608..40884ad806fd84906a6639151f14cabcb21607eb 100644 (file)
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-21  Bear Giles  <bgiles@coyotesong.com>
+
+       * fetch_mkey.c (krb5_db_fetch_mkey): Don't attempt to override
+       type of key read from stash file.
+
 2000-02-18  Tom Yu  <tlyu@mit.edu>
 
        * kdb_cpw.c (krb5_dbe_crk): 

diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c
index d9a742ff2c4313285c973ff059a9dc9898ba4833..2ff5c2942a5e690cc3108000c613e741f0d599b2 100644 (file)
--- 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;