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

(kt_get): reorganize some. open the keytab (defaulting to the modify

Browse Source 
one)


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9887 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-05-10 15:42:01 +00:00
parent cf4cea286c
commit a54ed99f1e
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
admin/get.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2001 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -38,9 +38,10 @@ RCSID("$Id$");
int int
kt_get(int argc, char **argv) kt_get(int argc, char **argv)
{ {
krb5_error_code ret; krb5_error_code ret = 0;
krb5_keytab keytab;
kadm5_config_params conf; kadm5_config_params conf;
void *kadm_handle; void *kadm_handle = NULL;
char *principal = NULL; char *principal = NULL;
char *realm = NULL; char *realm = NULL;
char *admin_server = NULL; char *admin_server = NULL;
@@ -83,9 +84,24 @@ kt_get(int argc, char **argv)
|| help_flag) { || help_flag) {
arg_printusage(args, sizeof(args) / sizeof(args[0]), arg_printusage(args, sizeof(args) / sizeof(args[0]),
"ktutil get", "principal..."); "ktutil get", "principal...");
return 0; 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);
return 1;
}
if (etype_strs.num_strings) { if (etype_strs.num_strings) {
int i; int i;
@@ -132,10 +148,9 @@ kt_get(int argc, char **argv)
&kadm_handle); &kadm_handle);
if(ret) { if(ret) {
krb5_warn(context, ret, "kadm5_init_with_password"); krb5_warn(context, ret, "kadm5_init_with_password");
return 0; goto out;
} }
for(i = optind; i < argc; i++){ for(i = optind; i < argc; i++){
krb5_principal princ_ent; krb5_principal princ_ent;
kadm5_principal_ent_rec princ; kadm5_principal_ent_rec princ;
@@ -223,6 +238,8 @@ kt_get(int argc, char **argv)
out: out:
free_getarg_strings(&etype_strs); free_getarg_strings(&etype_strs);
free(etypes); free(etypes);
kadm5_destroy(kadm_handle); if (kadm_handle)
return 0; kadm5_destroy(kadm_handle);
krb5_kt_close(context, keytab);
return ret != 0;
} }