Eliminate the unused realm_dbname field from krb5_realm_params

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23968 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/adm.h b/src/include/adm.h
index f857d1898b180827c8922c6643ee6bd887b21b55..68f3c7a897ff107b0dad74fafaee48fc46875ffd 100644 (file)
--- a/src/include/adm.h
+++ b/src/include/adm.h
@@ -195,7 +195,6 @@
  */
 typedef struct __krb5_realm_params {
     char *              realm_profile;
-    char *              realm_dbname;
     char *              realm_mkey_name;
     char *              realm_stash_file;
     char *              realm_kdc_ports;

diff --git a/src/kdc/extern.h b/src/kdc/extern.h
index 41ed439b84f77f5a6bde1f41ec7a272d17dabd82..bb188e7e57efb865353cf53a313e7f9c99695852 100644 (file)
--- a/src/kdc/extern.h
+++ b/src/kdc/extern.h
@@ -50,7 +50,6 @@ typedef struct __kdc_realm_data {
     /*
      * Database per-realm data.
      */
-    char *              realm_dbname;   /* Database name for realm          */
     char *              realm_stash;    /* Stash file name for realm        */
     char *              realm_mpname;   /* Master principal name for realm  */
     krb5_principal      realm_mprinc;   /* Master principal for realm       */

diff --git a/src/kdc/main.c b/src/kdc/main.c
index eaa70626fa502518b637a586f3b6da8d03263682..7cc64b80957b7a3dbf23e78faa9f7f43b4f86be9 100644 (file)
--- a/src/kdc/main.c
+++ b/src/kdc/main.c
@@ -164,8 +164,6 @@ setup_server_realm(krb5_principal sprinc)
 static void
 finish_realm(kdc_realm_t *rdp)
 {
-    if (rdp->realm_dbname)
-        free(rdp->realm_dbname);
     if (rdp->realm_mpname)
         free(rdp->realm_mpname);
     if (rdp->realm_stash)

diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h
index 8fad11177f49942a451b1faa98deb58be861e9cc..bc882450ec9f3fc795301cfe2fee7bee2ab0993e 100644 (file)
--- a/src/lib/kadm5/admin.h
+++ b/src/lib/kadm5/admin.h
@@ -280,7 +280,6 @@ typedef struct _kadm5_config_params {
  */
 typedef struct __krb5_realm_params {
     char *              realm_profile;
-    char *              realm_dbname;
     char *              realm_mkey_name;
     char *              realm_stash_file;
     char *              realm_kdc_ports;

diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c
index 5b967a0ce0aa1015b543860d8addb1906dd41955..b4841bae8ec14b06292f0b4cb07b63ad8f21a7db 100644 (file)
--- a/src/lib/kadm5/alt_prof.c
+++ b/src/lib/kadm5/alt_prof.c
@@ -955,13 +955,10 @@ krb5_read_realm_params(kcontext, realm, rparamp)
     /* Initialize realm parameters */
     memset(rparams, 0, sizeof(krb5_realm_params));
 
-    /* Get the value for the database */
+    /* Set up the hierarchy so we can query multiple realm variables. */
     hierarchy[0] = KRB5_CONF_REALMS;
     hierarchy[1] = lrealm;
-    hierarchy[2] = KRB5_CONF_DATABASE_NAME;
     hierarchy[3] = (char *) NULL;
-    if (!krb5_aprof_get_string(aprofile, hierarchy, TRUE, &svalue))
-        rparams->realm_dbname = svalue;
 
     /* Get the value for the KDC port list */
     hierarchy[2] = KRB5_CONF_KDC_PORTS;
@@ -1105,7 +1102,6 @@ krb5_free_realm_params(kcontext, rparams)
 {
     if (rparams) {
         free(rparams->realm_profile);
-        free(rparams->realm_dbname);
         free(rparams->realm_mkey_name);
         free(rparams->realm_stash_file);
         free(rparams->realm_keysalts);