move common code for opening the keytab to ktutil.c

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10383 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2001-07-23 09:46:41 +00:00
parent fd34ebd90c
commit 4d7d46d8b7
7 changed files with 36 additions and 79 deletions

View File

@@ -87,20 +87,8 @@ kt_get(int argc, char **argv)
return 1;
}
if (keytab_string == NULL) {
ret = krb5_kt_default_modify_name (context, keytab_buf,
sizeof(keytab_buf));
if (ret) {
krb5_warn(context, ret, "krb5_kt_default_modify_name");
return 1;
}
keytab_string = keytab_buf;
}
ret = krb5_kt_resolve(context, keytab_string, &keytab);
if (ret) {
krb5_warn(context, ret, "resolving keytab %s", keytab_string);
if((keytab = ktutil_open_keytab()) == NULL)
return 1;
}
if (etype_strs.num_strings) {
int i;
@@ -140,6 +128,9 @@ kt_get(int argc, char **argv)
conf.mask |= KADM5_CONFIG_KADMIND_PORT;
}
/* should get realm from each principal, instead of doing
everything with the same (local) realm */
ret = kadm5_init_with_password_ctx(context,
principal,
NULL,