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

(kt_get): allow specification of encryption types

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9818 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-04-25 12:07:07 +00:00
parent 5453ea0c98
commit 9b75306702
1 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
admin/get.c
View File

@@ -48,11 +48,16 @@ kt_get(int argc, char **argv)
int help_flag = 0; int help_flag = 0;
int optind = 0; int optind = 0;
int i, j; int i, j;
struct getarg_strings etype_strs = {0, NULL};
krb5_enctype *etypes = NULL;
size_t netypes = 0;
struct getargs args[] = { struct getargs args[] = {
{ "principal", 'p', arg_string, NULL, { "principal", 'p', arg_string, NULL,
"admin principal", "principal" "admin principal", "principal"
}, },
{ "enctypes", 'e', arg_strings, NULL,
"encryption types to use", "enctypes" },
{ "realm", 'r', arg_string, NULL, { "realm", 'r', arg_string, NULL,
"realm to use", "realm" "realm to use", "realm"
}, },
@@ -66,10 +71,11 @@ kt_get(int argc, char **argv)
}; };
args[0].value = &principal; args[0].value = &principal;
args[1].value = &realm; args[1].value = &etype_strs;
args[2].value = &admin_server; args[2].value = &realm;
args[3].value = &server_port; args[3].value = &admin_server;
args[4].value = &help_flag; args[4].value = &server_port;
args[5].value = &help_flag;
memset(&conf, 0, sizeof(conf)); memset(&conf, 0, sizeof(conf));
@@ -80,6 +86,27 @@ kt_get(int argc, char **argv)
return 0; return 0;
} }
if (etype_strs.num_strings) {
int i;
etypes = malloc (etype_strs.num_strings * sizeof(*etypes));
if (etypes == NULL) {
krb5_warnx(context, "malloc failed");
goto out;
}
netypes = etype_strs.num_strings;
for(i = 0; i < netypes; i++) {
ret = krb5_string_to_enctype(context,
etype_strs.strings[i],
&etypes[i]);
if(ret) {
krb5_warnx(context, "unrecognized enctype: %s",
etype_strs.strings[i]);
goto out;
}
}
}
if(realm) { if(realm) {
krb5_set_default_realm(context, realm); /* XXX should be fixed krb5_set_default_realm(context, realm); /* XXX should be fixed
some other way */ some other way */
@@ -166,17 +193,36 @@ kt_get(int argc, char **argv)
continue; continue;
} }
for(j = 0; j < n_keys; j++) { for(j = 0; j < n_keys; j++) {
entry.principal = princ_ent; int do_add = TRUE;
entry.vno = princ.kvno;
entry.keyblock = keys[j]; if (netypes) {
entry.timestamp = time (NULL); int i;
ret = krb5_kt_add_entry(context, keytab, &entry);
do_add = FALSE;
for (i = 0; i < netypes; ++i)
if (keys[j].keytype == etypes[i]) {
do_add = TRUE;
break;
}
}
if (do_add) {
entry.principal = princ_ent;
entry.vno = princ.kvno;
entry.keyblock = keys[j];
entry.timestamp = time (NULL);
ret = krb5_kt_add_entry(context, keytab, &entry);
if (ret)
krb5_warn(context, ret, "krb5_kt_add_entry");
}
krb5_free_keyblock_contents(context, &keys[j]); krb5_free_keyblock_contents(context, &keys[j]);
} }
kadm5_free_principal_ent(kadm_handle, &princ); kadm5_free_principal_ent(kadm_handle, &princ);
krb5_free_principal(context, princ_ent); krb5_free_principal(context, princ_ent);
} }
out:
free_getarg_strings(&etype_strs);
free(etypes);
kadm5_destroy(kadm_handle); kadm5_destroy(kadm_handle);
return 0; return 0;
} }