Remove unused krb5_realm_params fields

krb5_realm_params is only consumed by the KDC (everything else uses
kadm5_config_params), so only needs to contain fields used by the KDC.
Get rid of everything else.  Also get rid of realm_profile, which is
read in by KDC code but never used (and was never set anyway).

diff --git a/src/kdc/main.c b/src/kdc/main.c
index a5605f8c49900b57ed52090f461e448c447b7aa1..26d390798df8c88fe4568378d36d590168c02ab7 100644 (file)
--- a/src/kdc/main.c
+++ b/src/kdc/main.c
@@ -237,15 +237,6 @@ init_realm(kdc_realm_t *rdp, char *realm, char *def_mpname,
         goto whoops;
     }
 
-    /* Handle profile file name */
-    if (rparams && rparams->realm_profile) {
-        rdp->realm_profile = strdup(rparams->realm_profile);
-        if (!rdp->realm_profile) {
-            kret = ENOMEM;
-            goto whoops;
-        }
-    }
-
     /* Handle master key name */
     if (rparams && rparams->realm_mkey_name)
         rdp->realm_mpname = strdup(rparams->realm_mkey_name);

diff --git a/src/kdc/realm_data.h b/src/kdc/realm_data.h
index 1593c442e5260b32e06b6a7ba66ea203d84b2bc8..c1a64fba092f074618430ad7199493e64cf88e65 100644 (file)
--- a/src/kdc/realm_data.h
+++ b/src/kdc/realm_data.h
@@ -44,7 +44,6 @@ typedef struct __kdc_realm_data {
  * cannot span multiple realms -- proven */
     krb5_context        realm_context;  /* Context to be used for realm     */
     krb5_keytab         realm_keytab;   /* keytab to be used for this realm */
-    char *              realm_profile;  /* Profile file for this realm      */
     char *              realm_hostbased; /* referral services for NT-UNKNOWN */
     char *              realm_no_referral; /* non-referral services         */
     /*

diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h
index 1af7ac278cd0cc582b5a1de7140e567f38d77403..47102cd3de074bf28b83c6870658ceb787518123 100644 (file)
--- a/src/lib/kadm5/admin.h
+++ b/src/lib/kadm5/admin.h
@@ -288,34 +288,24 @@ typedef struct _kadm5_config_params {
  * Data structure returned by krb5_read_realm_params()
  */
 typedef struct __krb5_realm_params {
-    char *              realm_profile;
     char *              realm_mkey_name;
     char *              realm_stash_file;
     char *              realm_kdc_ports;
     char *              realm_kdc_tcp_ports;
-    char *              realm_acl_file;
     char *              realm_hostbased;
     char *              realm_no_referral;
-    krb5_int32          realm_kadmind_port;
     krb5_enctype        realm_enctype;
     krb5_deltat         realm_max_life;
     krb5_deltat         realm_max_rlife;
-    krb5_timestamp      realm_expiration;
-    krb5_flags          realm_flags;
-    krb5_key_salt_tuple *realm_keysalts;
     unsigned int        realm_reject_bad_transit:1;
     unsigned int        realm_restrict_anon:1;
-    unsigned int        realm_kadmind_port_valid:1;
     unsigned int        realm_enctype_valid:1;
     unsigned int        realm_max_life_valid:1;
     unsigned int        realm_max_rlife_valid:1;
-    unsigned int        realm_expiration_valid:1;
-    unsigned int        realm_flags_valid:1;
     unsigned int        realm_reject_bad_transit_valid:1;
     unsigned int        realm_restrict_anon_valid:1;
     unsigned int        realm_assume_des_crc_sess:1;
     unsigned int        realm_assume_des_crc_sess_valid:1;
-    krb5_int32          realm_num_keysalts;
 } krb5_realm_params;
 
 /*

diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c
index e527cd45ced99786b1839d44eb86f97f73d6fa2d..075e077dae69272cd5ec11e1b90196a48aa29835 100644 (file)
--- a/src/lib/kadm5/alt_prof.c
+++ b/src/lib/kadm5/alt_prof.c
@@ -883,12 +883,11 @@ krb5_error_code
 krb5_read_realm_params(krb5_context context, char *realm,
                        krb5_realm_params **rparamp)
 {
-    char *envname, *lrealm, *svalue, *sp, *ep, *tp;
+    char *envname, *lrealm, *svalue;
     char *no_referral = NULL, *hostbased = NULL;
     krb5_pointer aprofile = NULL;
     krb5_realm_params *rparams = NULL;
     const char *hierarchy[4];
-    krb5_int32 ivalue;
     krb5_boolean bvalue;
     krb5_deltat dtvalue;
     krb5_error_code ret;
@@ -925,18 +924,6 @@ krb5_read_realm_params(krb5_context context, char *realm,
     if (!krb5_aprof_get_string(aprofile, hierarchy, TRUE, &svalue))
         rparams->realm_kdc_tcp_ports = svalue;
 
-    /* Get the name of the acl file */
-    hierarchy[2] = KRB5_CONF_ACL_FILE;
-    if (!krb5_aprof_get_string(aprofile, hierarchy, TRUE, &svalue))
-        rparams->realm_acl_file = svalue;
-
-    /* Get the value for the kadmind port */
-    hierarchy[2] = KRB5_CONF_KADMIND_PORT;
-    if (!krb5_aprof_get_int32(aprofile, hierarchy, TRUE, &ivalue)) {
-        rparams->realm_kadmind_port = ivalue;
-        rparams->realm_kadmind_port_valid = 1;
-    }
-
     /* Get the value for the master key name */
     hierarchy[2] = KRB5_CONF_MASTER_KEY_NAME;
     if (!krb5_aprof_get_string(aprofile, hierarchy, TRUE, &svalue))
@@ -969,14 +956,6 @@ krb5_read_realm_params(krb5_context context, char *realm,
         rparams->realm_max_rlife_valid = 1;
     }
 
-    /* Get the value for the default principal expiration */
-    hierarchy[2] = KRB5_CONF_DEFAULT_PRINCIPAL_EXPIRATION;
-    if (!krb5_aprof_get_string(aprofile, hierarchy, TRUE, &svalue)) {
-        if (!krb5_string_to_timestamp(svalue, &rparams->realm_expiration))
-            rparams->realm_expiration_valid = 1;
-        free(svalue);
-    }
-
     hierarchy[2] = KRB5_CONF_REJECT_BAD_TRANSIT;
     if (!krb5_aprof_get_boolean(aprofile, hierarchy, TRUE, &bvalue)) {
         rparams->realm_reject_bad_transit = bvalue;
@@ -1003,40 +982,6 @@ krb5_read_realm_params(krb5_context context, char *realm,
     if (!krb5_aprof_get_string_all(aprofile, hierarchy, &hostbased))
         rparams->realm_hostbased = hostbased;
 
-    /* Get the value for the default principal flags. */
-    hierarchy[2] = KRB5_CONF_DEFAULT_PRINCIPAL_FLAGS;
-    if (!krb5_aprof_get_string(aprofile, hierarchy, TRUE, &svalue)) {
-        sp = svalue;
-        rparams->realm_flags = 0;
-        while (sp) {
-            if ((ep = strchr(sp, ',')) != NULL ||
-                (ep = strchr(sp, ' ')) != NULL||
-                (ep = strchr(sp, '\t')) != NULL) {
-                /* Fill in trailing whitespace of sp. */
-                tp = ep - 1;
-                while (isspace((unsigned char)*tp) && (tp < sp)) {
-                    *tp = '\0';
-                    tp--;
-                }
-                *ep = '\0';
-                ep++;
-                /* Skip over trailing whitespace of ep. */
-                while (isspace((unsigned char)*ep) && *ep != '\0')
-                    ep++;
-            }
-            /* Convert this flag. */
-            if (krb5_string_to_flags(sp, "+", "-", &rparams->realm_flags))
-                break;
-            sp = ep;
-        }
-        if (sp == NULL)
-            rparams->realm_flags_valid = 1;
-        free(svalue);
-    }
-
-    rparams->realm_keysalts = NULL;
-    rparams->realm_num_keysalts = 0;
-
 cleanup:
     if (aprofile)
         krb5_aprof_finish(aprofile);
@@ -1058,13 +1003,10 @@ krb5_free_realm_params(krb5_context context, krb5_realm_params *rparams)
 {
     if (rparams == NULL)
         return 0;
-    free(rparams->realm_profile);
     free(rparams->realm_mkey_name);
     free(rparams->realm_stash_file);
-    free(rparams->realm_keysalts);
     free(rparams->realm_kdc_ports);
     free(rparams->realm_kdc_tcp_ports);
-    free(rparams->realm_acl_file);
     free(rparams->realm_no_referral);
     free(rparams->realm_hostbased);
     free(rparams);