diff options
| author | Richard Basch <probe@mit.edu> | 1995-12-12 19:45:01 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1995-12-12 19:45:01 +0000 |
| commit | d32583334d261f4b472a220044d1bb440e256632 (patch) | |
| tree | a17e91f3ae7446c6ca36cec1175ab769e0fdbb23 /src/kdc/main.c | |
| parent | 24aed8a13c24b4cf85aabb6e321f342d2c8ca1ac (diff) | |
| download | krb5-d32583334d261f4b472a220044d1bb440e256632.tar.gz krb5-d32583334d261f4b472a220044d1bb440e256632.tar.xz krb5-d32583334d261f4b472a220044d1bb440e256632.zip | |
* main.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@7209 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kdc/main.c')
| -rw-r--r-- | src/kdc/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kdc/main.c b/src/kdc/main.c index 68e6886dc..27c38c66f 100644 --- a/src/kdc/main.c +++ b/src/kdc/main.c @@ -360,9 +360,8 @@ init_realm(progname, rdp, realm, def_dbname, def_mpname, rdp->realm_mkey.enctype = (krb5_enctype) rparams->realm_enctype; else - /* If not manual, we can lookup the enctype */ - rdp->realm_mkey.enctype = (def_enctype || !manual) - ? def_enctype : ENCTYPE_DES_CBC_CRC; + rdp->realm_mkey.enctype = + manual ? def_enctype : ENCTYPE_UNKNOWN; /* Handle ticket maximum life */ rdp->realm_maxlife = (rparams && rparams->realm_max_life_valid) ? @@ -428,7 +427,8 @@ init_realm(progname, rdp, realm, def_dbname, def_mpname, } /* Select the specified encryption type */ - if (rdp->realm_mkey.enctype) + /* krb5_db_fetch_mkey will setup the encblock for stashed keys */ + if (manual) krb5_use_enctype(rdp->realm_context, &rdp->realm_encblock, rdp->realm_mkey.enctype); |