From 481b7dae6a63cbea46fe1379d221b500c3a7403a Mon Sep 17 00:00:00 2001
From: Greg Hudson <ghudson@mit.edu>
Date: Tue, 4 May 2010 15:58:59 +0000
Subject: [PATCH] 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
---
 src/include/adm.h        | 1 -
 src/kdc/extern.h         | 1 -
 src/kdc/main.c           | 2 --
 src/lib/kadm5/admin.h    | 1 -
 src/lib/kadm5/alt_prof.c | 6 +-----
 5 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/include/adm.h b/src/include/adm.h
index f857d1898..68f3c7a89 100644
--- 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 41ed439b8..bb188e7e5 100644
--- 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 eaa70626f..7cc64b809 100644
--- 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 8fad11177..bc882450e 100644
--- 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 5b967a0ce..b4841bae8 100644
--- 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);
-- 
2.26.2