svn rev #23968: trunk/src/ include/ kdc/ lib/kadm5/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23968
Commit By: ghudson
Log Message:
Eliminate the unused realm_dbname field from krb5_realm_params.



Changed Files:
U   trunk/src/include/adm.h
U   trunk/src/kdc/extern.h
U   trunk/src/kdc/main.c
U   trunk/src/lib/kadm5/admin.h
U   trunk/src/lib/kadm5/alt_prof.c
Modified: trunk/src/include/adm.h
===================================================================
--- trunk/src/include/adm.h	2010-05-04 05:49:39 UTC (rev 23967)
+++ trunk/src/include/adm.h	2010-05-04 15:58:59 UTC (rev 23968)
@@ -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;

Modified: trunk/src/kdc/extern.h
===================================================================
--- trunk/src/kdc/extern.h	2010-05-04 05:49:39 UTC (rev 23967)
+++ trunk/src/kdc/extern.h	2010-05-04 15:58:59 UTC (rev 23968)
@@ -50,7 +50,6 @@
     /*
      * 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       */

Modified: trunk/src/kdc/main.c
===================================================================
--- trunk/src/kdc/main.c	2010-05-04 05:49:39 UTC (rev 23967)
+++ trunk/src/kdc/main.c	2010-05-04 15:58:59 UTC (rev 23968)
@@ -164,8 +164,6 @@
 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)

Modified: trunk/src/lib/kadm5/admin.h
===================================================================
--- trunk/src/lib/kadm5/admin.h	2010-05-04 05:49:39 UTC (rev 23967)
+++ trunk/src/lib/kadm5/admin.h	2010-05-04 15:58:59 UTC (rev 23968)
@@ -280,7 +280,6 @@
  */
 typedef struct __krb5_realm_params {
     char *              realm_profile;
-    char *              realm_dbname;
     char *              realm_mkey_name;
     char *              realm_stash_file;
     char *              realm_kdc_ports;

Modified: trunk/src/lib/kadm5/alt_prof.c
===================================================================
--- trunk/src/lib/kadm5/alt_prof.c	2010-05-04 05:49:39 UTC (rev 23967)
+++ trunk/src/lib/kadm5/alt_prof.c	2010-05-04 15:58:59 UTC (rev 23968)
@@ -955,13 +955,10 @@
     /* 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 @@
 {
     if (rparams) {
         free(rparams->realm_profile);
-        free(rparams->realm_dbname);
         free(rparams->realm_mkey_name);
         free(rparams->realm_stash_file);
         free(rparams->realm_keysalts);