diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2000-02-21 21:39:11 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2000-02-21 21:39:11 +0000 |
| commit | 55ece37e84052d0a94ad6502333e90cf4eeb76f6 (patch) | |
| tree | 4517ff3c4abb19f2ed64efb3084002e6870d5ad9 /src/lib | |
| parent | 0430a54da609d91bdf79e48804358db6374e9dcf (diff) | |
| download | krb5-55ece37e84052d0a94ad6502333e90cf4eeb76f6.tar.gz krb5-55ece37e84052d0a94ad6502333e90cf4eeb76f6.tar.xz krb5-55ece37e84052d0a94ad6502333e90cf4eeb76f6.zip | |
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
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kdb/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 699e523e8e..40884ad806 100644 --- 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 d9a742ff2c..2ff5c2942a 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; |