From 4bae6714d1d3c0d9387f653f35afd03f238d48d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sat, 12 Jun 2004 07:45:34 +0000 Subject: [PATCH] if keyfile is set, pass in to libkadm5 bug pointed out by Elrond git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13922 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kadmin/kadmin.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/kadmin/kadmin.c b/kadmin/kadmin.c index b2390c756..f5077bb2d 100644 --- a/kadmin/kadmin.c +++ b/kadmin/kadmin.c @@ -267,14 +267,6 @@ main(int argc, char **argv) if(ret) krb5_err(context, 1, ret, "reading configuration files"); - { - const char *p = krb5_config_get_string (context, NULL, - "kdc", "key-file", NULL); - if (p) - keyfile = strdup(p); - } - krb5_clear_error_string (context); - memset(&conf, 0, sizeof(conf)); if(realm) { krb5_set_default_realm(context, realm); /* XXX should be fixed @@ -293,6 +285,11 @@ main(int argc, char **argv) conf.mask |= KADM5_CONFIG_KADMIND_PORT; } + if (keyfile) { + conf.stash_file = keyfile; + conf.mask |= KADM5_CONFIG_STASH_FILE; + } + if(local_flag){ ret = kadm5_s_init_with_password_ctx(context, KADM5_ADMIN_SERVICE,