diff options
author | Richard Basch <probe@mit.edu> | 1995-12-12 19:45:23 +0000 |
---|---|---|
committer | Richard Basch <probe@mit.edu> | 1995-12-12 19:45:23 +0000 |
commit | 5c270f13fd2bb5509be8e8427dc7f3ea28ea0805 (patch) | |
tree | bd1833a1212d0b7f561337d827c95e963f4569a0 /src/krb524/krb524d.c | |
parent | 69aa8f11de56ab42e17496e30125a82dc4fe6dec (diff) | |
download | krb5-5c270f13fd2bb5509be8e8427dc7f3ea28ea0805.tar.gz krb5-5c270f13fd2bb5509be8e8427dc7f3ea28ea0805.tar.xz krb5-5c270f13fd2bb5509be8e8427dc7f3ea28ea0805.zip |
* krb524d.c: Changed krb5_db_fetch_mkey() such that it will only try
to set the enctype of the keyblock if the keyblock had it
set to ENCTYPE_UNKNOWN.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7211 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/krb524/krb524d.c')
-rw-r--r-- | src/krb524/krb524d.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c index 1c83b3866..6522e7551 100644 --- a/src/krb524/krb524d.c +++ b/src/krb524/krb524d.c @@ -227,7 +227,9 @@ void init_master(context) free(realm); } - master_keyblock.enctype = NULL; /* Look up the stashed enctype */ + /* Use the stashed enctype */ + master_keyblock.enctype = ENCTYPE_UNKNOWN; + if ((ret = krb5_db_fetch_mkey(context, master_princ, &master_encblock, FALSE, /* non-manual type-in */ FALSE, /* irrelevant, given prev. arg */ |