From 2773d72986b2aab66e3f1e38c59099ca38987d6c Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Thu, 26 Aug 1999 13:09:56 +0000 Subject: [PATCH] use HDB keytabs git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6873 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kadmin/kadmind.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kadmin/kadmind.c b/kadmin/kadmind.c index 1d5854768..328bba12b 100644 --- a/kadmin/kadmind.c +++ b/kadmin/kadmind.c @@ -42,7 +42,7 @@ RCSID("$Id$"); static char *config_file; static char *keyfile; -static char *keytab_str; +static char *keytab_str = "HDB:"; static int help_flag; static int version_flag; static int debug_flag; @@ -119,6 +119,10 @@ main(int argc, char **argv) argc -= 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) config_file = HDB_DB_DIR "/kdc.conf"; @@ -129,13 +133,9 @@ main(int argc, char **argv) keyfile = strdup(p); } - if(keytab_str == NULL) - keytab = NULL; - else { - ret = krb5_kt_resolve(context, keytab_str, &keytab); - if(ret) - krb5_err(context, 1, ret, "krb5_kt_resolve"); - } + ret = krb5_kt_resolve(context, keytab_str, &keytab); + if(ret) + krb5_err(context, 1, ret, "krb5_kt_resolve"); { int fd = 0;