svn commit: lorikeet r326 - in trunk/heimdal/kdc: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-06-02 23:17:25 +0000 (Thu, 02 Jun 2005)
New Revision: 326

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=326

Log:
More cleanup on the config structures, we only need the final HDB form there.

Andrew Bartlett

Modified:
   trunk/heimdal/kdc/config.c
   trunk/heimdal/kdc/kdc.h


Changeset:
Modified: trunk/heimdal/kdc/config.c
===================================================================
--- trunk/heimdal/kdc/config.c	2005-06-02 12:46:36 UTC (rev 325)
+++ trunk/heimdal/kdc/config.c	2005-06-02 23:17:25 UTC (rev 326)
@@ -40,6 +40,13 @@
 
 RCSID("$Id: config.c,v 1.59 2005/05/23 17:34:12 lha Exp $");
 
+struct dbinfo {
+	    char *realm;
+	    char *dbname;
+	    char *mkey_file;
+	    struct dbinfo *next;
+};
+
 static const char *config_file;	/* location of kdc config file */
 
 static int require_preauth = -1;	/* 1 == require preauth for all principals */
@@ -74,12 +81,6 @@
 	"max-request",	0,	arg_string, &max_request, 
 	"max size for a kdc-request", "size"
     },
-#if 0
-    {
-	"database",	'd', 	arg_string, &databases,
-	"location of database", "database"
-    },
-#endif
     { "enable-http", 'H', arg_flag, &enable_http, "turn on HTTP support" },
     {	"524",		0, 	arg_negative_flag, &enable_524,
 	"don't respond to 524 requests" 
@@ -143,9 +144,10 @@
     const char *default_mkey = HDB_DB_DIR "/m-key";
     const char *p;
     krb5_error_code ret;
+    
+    struct dbinfo *databases = NULL;
 
-    config->databases = NULL;
-    dt = &config->databases;
+    dt = &databases;
     while((db_binding = (const krb5_config_binding *)
 	   krb5_config_get_next(context, NULL, &top_binding, 
 				krb5_config_list, 
@@ -187,7 +189,7 @@
 	}
 	*dt = di;
 	dt = &di->next;
-    } else if(config->databases == NULL) {
+    } else if(databases == NULL) {
 	/* if there are none specified, use some default */
 	di = calloc(1, sizeof(*di));
 	di->dbname = strdup(default_dbname);
@@ -195,7 +197,7 @@
 	*dt = di;
 	dt = &di->next;
     }
-    for(di = config->databases; di; di = di->next) {
+    for(di = databases; di; di = di->next) {
 	if(di->dbname == NULL)
 	    di->dbname = strdup(default_dbname);
 	if(di->mkey_file == NULL) {
@@ -211,7 +213,7 @@
 	}
     }
 
-    if (config->databases == NULL) {
+    if (databases == NULL) {
 	config->db = malloc(sizeof(*config->db));
 	config->num_db = 1;
 	ret = hdb_create(context, &config->db[0], NULL);
@@ -224,9 +226,9 @@
 	struct dbinfo *d;
 	int i;
 	/* count databases */
-	for(d = config->databases, i = 0; d; d = d->next, i++);
+	for(d = databases, i = 0; d; d = d->next, i++);
 	config->db = malloc(i * sizeof(*config->db));
-	for(d = config->databases, config->num_db = 0; d; d = d->next, config->num_db++) {
+	for(d = databases, config->num_db = 0; d; d = d->next, config->num_db++) {
 	    ret = hdb_create(context, &config->db[config->num_db], d->dbname);
 	    if(ret)
 		krb5_err(context, 1, ret, "hdb_create %s", d->dbname);
@@ -460,9 +462,9 @@
 						    NULL);
 
     config->kdc_warn_pwexpire = krb5_config_get_time (context, NULL,
-					      "kdc",
-					      "kdc_warn_pwexpire",
-					      NULL);
+						      "kdc",
+						      "kdc_warn_pwexpire",
+						      NULL);
 
     if(detach_from_console == -1)
 	detach_from_console = krb5_config_get_bool_default(context, NULL, 

Modified: trunk/heimdal/kdc/kdc.h
===================================================================
--- trunk/heimdal/kdc/kdc.h	2005-06-02 12:46:36 UTC (rev 325)
+++ trunk/heimdal/kdc/kdc.h	2005-06-02 23:17:25 UTC (rev 326)
@@ -41,13 +41,6 @@
 #ifndef __KDC_H__
 #define __KDC_H__
 
-struct dbinfo {
-    char *realm;
-    char *dbname;
-    char *mkey_file;
-    struct dbinfo *next;
-};
-
 enum { TRPOLICY_ALWAYS_CHECK,
        TRPOLICY_ALLOW_PER_PRINCIPAL, 
        TRPOLICY_ALWAYS_HONOUR_REQUEST };
@@ -57,7 +50,6 @@
 	
 	time_t kdc_warn_pwexpire;	/* time before expiration to print a warning */
 	
-	struct dbinfo *databases;
 	struct HDB **db;
 	int num_db;