oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

if keyfile is set, pass in to libkadm5

Browse Source 
bug pointed out by Elrond <elrond@samba-tng.org>


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13922 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-06-12 07:45:34 +00:00
parent 1c2b8aec3c
commit 4bae6714d1
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kadmin/kadmin.c
View File

@@ -267,14 +267,6 @@ main(int argc, char **argv)
if(ret) if(ret)
krb5_err(context, 1, ret, "reading configuration files"); 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)); memset(&conf, 0, sizeof(conf));
if(realm) { if(realm) {
krb5_set_default_realm(context, realm); /* XXX should be fixed 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; conf.mask |= KADM5_CONFIG_KADMIND_PORT;
} }
if (keyfile) {
conf.stash_file = keyfile;
conf.mask |= KADM5_CONFIG_STASH_FILE;
}
if(local_flag){ if(local_flag){
ret = kadm5_s_init_with_password_ctx(context, ret = kadm5_s_init_with_password_ctx(context,
KADM5_ADMIN_SERVICE, KADM5_ADMIN_SERVICE,