From eda0d93e0a116f3f54fa193182dd0cba35bd9d08 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Tue, 9 Nov 1999 17:53:44 +0000
Subject: [PATCH] (kadm5_s_init_with_context): actually use some passed values

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7327 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/kadm5/init_s.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/lib/kadm5/init_s.c b/lib/kadm5/init_s.c
index cba633c0f..dd369318f 100644
--- a/lib/kadm5/init_s.c
+++ b/lib/kadm5/init_s.c
@@ -40,6 +40,7 @@
 
 RCSID("$Id$");
 
+
 static kadm5_ret_t 
 kadm5_s_init_with_context(krb5_context context,
 			  const char *client_name, 
@@ -54,29 +55,23 @@ kadm5_s_init_with_context(krb5_context context,
     ret = _kadm5_s_init_context(&ctx, realm_params, context);
     if(ret)
 	return ret;
-    ret = hdb_create(ctx->context, &ctx->db, NULL);
+
+    assert(ctx->config.dbname != NULL);
+    assert(ctx->config.stash_file != NULL);
+    assert(ctx->config.acl_file != NULL);
+    assert(ctx->log_context.log_file != NULL);
+    assert(ctx->log_context.socket_name.sun_path[0] != '\0');
+
+    ret = hdb_create(ctx->context, &ctx->db, ctx->config.dbname);
     if(ret)
 	return ret;
     ret = hdb_set_master_keyfile (ctx->context, 
-				  ctx->db, NULL); /* XXX get from conf */
+				  ctx->db, ctx->config.stash_file);
     if(ret)
 	return ret;
 
-    ctx->acl_file = HDB_DB_DIR "/kadmind.acl";  /* XXX get from conf */
-    
-    ctx->log_context.log_file = HDB_DB_DIR "/log";
-
     ctx->log_context.log_fd   = -1;
 
-    {
-	struct sockaddr_un *un = &ctx->log_context.socket_name;
-
-	memset(un, 0, sizeof(*un));
-	un->sun_family = AF_UNIX;
-	strncpy (un->sun_path, KADM5_LOG_SIGNAL, sizeof(un->sun_path));
-	un->sun_path[sizeof(un->sun_path) - 1] = '\0';
-    }
-
     ctx->log_context.socket_fd = socket (AF_UNIX, SOCK_DGRAM, 0);
 
     ret = krb5_parse_name(ctx->context, client_name, &ctx->caller);