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

(main): move opening the logfile to after reading kdc.conf

Browse Source 
move the loading of hdb keytab ops closer to where its used
From: Jeffrey Hutzelman <jhutz@cmu.edu>


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13121 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-11-18 22:13:27 +00:00
parent 43d74c9d79
commit e9f1c07ce7
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
kadmin/kadmind.c
View File

@@ -112,9 +112,6 @@ main(int argc, char **argv)
if (ret) if (ret)
errx (1, "krb5_init_context failed: %d", ret); errx (1, "krb5_init_context failed: %d", ret);
ret = krb5_openlog(context, "kadmind", &logf);
ret = krb5_set_warn_dest(context, logf);
while((e = getarg(args, num_args, argc, argv, &optind))) while((e = getarg(args, num_args, argc, argv, &optind)))
warnx("error at argument `%s'", argv[optind]); warnx("error at argument `%s'", argv[optind]);
@@ -129,10 +126,6 @@ main(int argc, char **argv)
argc -= optind; argc -= optind;
argv += optind; argv += optind;
ret = krb5_kt_register(context, &hdb_kt_ops);
if(ret)
krb5_err(context, 1, ret, "krb5_kt_register");
if (config_file == NULL) if (config_file == NULL)
config_file = HDB_DB_DIR "/kdc.conf"; config_file = HDB_DB_DIR "/kdc.conf";
@@ -145,6 +138,13 @@ 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");
ret = krb5_openlog(context, "kadmind", &logf);
if (ret)
krb5_err(context, 1, ret, "krb5_openlog");
ret = krb5_set_warn_dest(context, logf);
if (ret)
krb5_err(context, 1, ret, "krb5_set_warn_dest");
{ {
const char *p = krb5_config_get_string (context, NULL, const char *p = krb5_config_get_string (context, NULL,
"kdc", "key-file", NULL); "kdc", "key-file", NULL);
@@ -152,6 +152,10 @@ main(int argc, char **argv)
keyfile = strdup(p); keyfile = strdup(p);
} }
ret = krb5_kt_register(context, &hdb_kt_ops);
if(ret)
krb5_err(context, 1, ret, "krb5_kt_register");
ret = krb5_kt_resolve(context, keytab_str, &keytab); ret = krb5_kt_resolve(context, keytab_str, &keytab);
if(ret) if(ret)
krb5_err(context, 1, ret, "krb5_kt_resolve"); krb5_err(context, 1, ret, "krb5_kt_resolve");