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

diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 36443abcd50c80bfbf89fb5053be6afb3ef481bc..7f8886495b205999687ae99b9eb542b064611922 100644 (file)
--- 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 c4490de7904cb84891915bfb5b4f10dd84a8011d..5582df090522b6e793b8fb2151644d9df18dc814 100644 (file)
--- 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: