From c561d08c04fdfa0430b4da7d03c0656bcd1212c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Mon, 18 Jun 2007 10:52:20 +0000
Subject: [PATCH] export get_dbinfo as krb5_kdc_set_dbinfo and call from users.
 This to allows libkdc users to to specify their own databases

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21110 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 kdc/config.c           |  4 ++++
 kdc/default_config.c   | 36 +++++++++++++++++++++++++-----------
 kdc/kdc-replay.c       |  4 ++++
 kdc/version-script.map |  1 +
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/kdc/config.c b/kdc/config.c
index 525c7ce04..fd0d0c717 100644
--- a/kdc/config.c
+++ b/kdc/config.c
@@ -202,6 +202,10 @@ configure(krb5_context context, int argc, char **argv)
 
     kdc_openlog(context, config);
 
+    ret = krb5_kdc_set_dbinfo(context, config);
+    if (ret)
+	krb5_err(context, 1, ret, "krb5_kdc_set_dbinfo");
+
     if(max_request_str)
 	max_request = parse_bytes(max_request_str, NULL);
 
diff --git a/kdc/default_config.c b/kdc/default_config.c
index 9f3495286..ea74f93eb 100644
--- a/kdc/default_config.c
+++ b/kdc/default_config.c
@@ -38,36 +38,39 @@
 
 RCSID("$Id$");
 
-static void
-get_dbinfo(krb5_context context, struct krb5_kdc_configuration *c)
+krb5_error_code
+krb5_kdc_set_dbinfo(krb5_context context, struct krb5_kdc_configuration *c)
 {
     struct hdb_dbinfo *info, *d;
     krb5_error_code ret;
+    int i;
 
     /* fetch the databases */
     ret = hdb_get_dbinfo(context, &info);
     if (ret)
-	krb5_err(context, 1, ret, "hdb_get_dbinfo");
+	return ret;
     
     d = NULL;
     while ((d = hdb_dbinfo_get_next(info, d)) != NULL) {
 	void *ptr;
 	
 	ptr = realloc(c->db, (c->num_db + 1) * sizeof(*c->db));
-	if (ptr == NULL)
-	    krb5_err(context, 1, ret, "out of memory");
+	if (ptr == NULL) {
+	    ret = ENOMEM;
+	    krb5_set_error_string(context, "out of memory");
+	    goto out;
+	}
 	c->db = ptr;
 	
 	ret = hdb_create(context, &c->db[c->num_db], 
 			 hdb_dbinfo_get_dbname(context, d));
 	if(ret)
-	    krb5_err(context, 1, ret, "hdb_create %s", 
-		     hdb_dbinfo_get_dbname(context, d));
+	    goto out;
 	
 	ret = hdb_set_master_keyfile(context, c->db[c->num_db], 
 				     hdb_dbinfo_get_mkey_file(context, d));
 	if (ret)
-	    krb5_err(context, 1, ret, "hdb_set_master_keyfile");
+	    goto out;
 	
 	c->num_db++;
 
@@ -81,10 +84,23 @@ get_dbinfo(krb5_context context, struct krb5_kdc_configuration *c)
 		hdb_dbinfo_get_mkey_file(context, d));
     }
     hdb_free_dbinfo(context, &info);
+
+    return 0;
+out:
+    for (i = 0; i < c->num_db; i++)
+	if (c->db[i] && c->db[i]->hdb_destroy)
+	    (*c->db[i]->hdb_destroy)(context, c->db[i]);
+    c->num_db = 0;
+    free(c->db);
+    c->db = NULL;
+ 
+    hdb_free_dbinfo(context, &info);
+
+    return ret;
 }
 
 
-int
+krb5_error_code
 krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config)
 {
     krb5_kdc_configuration *c;
@@ -112,8 +128,6 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config)
     c->num_db = 0;
     c->logf = NULL;
 
-    get_dbinfo(context, c);
-
     c->require_preauth =
 	krb5_config_get_bool_default(context, NULL, 
 				     c->require_preauth,
diff --git a/kdc/kdc-replay.c b/kdc/kdc-replay.c
index f43d14739..0344cdfb3 100644
--- a/kdc/kdc-replay.c
+++ b/kdc/kdc-replay.c
@@ -84,6 +84,10 @@ main(int argc, char **argv)
 
     kdc_openlog(context, config);
 
+    ret = krb5_kdc_set_dbinfo(context, config);
+    if (ret)
+	krb5_err(context, 1, ret, "krb5_kdc_set_dbinfo");
+
     if (argc != 2)
 	errx(1, "argc != 2");
 
diff --git a/kdc/version-script.map b/kdc/version-script.map
index 36fa086ea..47e90a9d4 100644
--- a/kdc/version-script.map
+++ b/kdc/version-script.map
@@ -8,6 +8,7 @@ HEIMDAL_KDC_1.0 {
 		kdc_openlog;
 		krb5_kdc_windc_init;
 		krb5_kdc_get_config;
+		krb5_kdc_set_dbinfo;
 		krb5_kdc_process_krb5_request;
 		krb5_kdc_process_request;
 		krb5_kdc_save_request;