diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2000-02-21 21:38:01 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2000-02-21 21:38:01 +0000 |
| commit | 0430a54da609d91bdf79e48804358db6374e9dcf (patch) | |
| tree | efa3f5ce9e833a61784f1ea24539f54a3531d0d1 /src/lib | |
| parent | 8f49ae0ab31aeb50349ac5578c3fe3429cb995e1 (diff) | |
| download | krb5-0430a54da609d91bdf79e48804358db6374e9dcf.tar.gz krb5-0430a54da609d91bdf79e48804358db6374e9dcf.tar.xz krb5-0430a54da609d91bdf79e48804358db6374e9dcf.zip | |
from Bear Giles:
* alt_prof.c (krb5_read_realm_params): Permit realm supported enctypes to be
unspecified, letting the KDC produce defaults. Don't look up enctypes at all
if an error is to be returned.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12060 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kadm5/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/kadm5/alt_prof.c | 29 |
2 files changed, 22 insertions, 13 deletions
diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog index 36443abcd5..7f8886495b 100644 --- a/src/lib/kadm5/ChangeLog +++ b/src/lib/kadm5/ChangeLog @@ -1,3 +1,9 @@ +2000-02-21 Bear Giles <bgiles@coyotesong.com> + + * alt_prof.c (krb5_read_realm_params): Permit realm supported + enctypes to be unspecified, letting the KDC produce defaults. + Don't look up enctypes at all if an error is to be returned. + 2000-02-18 Tom Yu <tlyu@mit.edu> * kadm_rpc_xdr.c (xdr_chpass3_arg): diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c index c4490de790..5582df0905 100644 --- a/src/lib/kadm5/alt_prof.c +++ b/src/lib/kadm5/alt_prof.c @@ -871,20 +871,23 @@ krb5_read_realm_params(kcontext, realm, kdcprofile, kdcenv, rparamp) /* Get the value for the supported enctype/salttype matrix */ /* XXX This is so that the kdc will search a different enctype list than kadmind */ - hierarchy[2] = "kdc_supported_enctypes"; - kret = krb5_aprof_get_string(aprofile, hierarchy, TRUE, &svalue); - if (kret) { - hierarchy[2] = "supported_enctypes"; - kret = krb5_aprof_get_string(aprofile, hierarchy, TRUE, &svalue); - } if (!kret) { - krb5_string_to_keysalts(svalue, - ", \t", /* Tuple separators */ - ":.-", /* Key/salt separators */ - 0, /* No duplicates */ - &rparams->realm_keysalts, - &rparams->realm_num_keysalts); - krb5_xfree(svalue); + hierarchy[2] = "kdc_supported_enctypes"; + kret = krb5_aprof_get_string(aprofile, hierarchy, TRUE, &svalue); + if (kret) { + hierarchy[2] = "supported_enctypes"; + kret = krb5_aprof_get_string(aprofile, hierarchy, TRUE, &svalue); + } + if (!kret) { + krb5_string_to_keysalts(svalue, + ", \t", /* Tuple separators */ + ":.-", /* Key/salt separators */ + 0, /* No duplicates */ + &rparams->realm_keysalts, + &rparams->realm_num_keysalts); + krb5_xfree(svalue); + } + kret = 0; } cleanup: |