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

add setting and displaying aliases

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20239 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-02-17 00:00:41 +00:00
parent 40b0371ec5
commit ea6db777a0
3 changed files with 115 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
kadmin/mod.c
View File

@@ -36,6 +36,70 @@
RCSID("$Id$");
static void
add_tl(kadm5_principal_ent_rec *princ, int type, krb5_data *data)
{
krb5_tl_data *tl, **ptl;
tl = ecalloc(1, sizeof(*tl));
tl->tl_data_next = NULL;
tl->tl_data_type = KRB5_TL_EXTENSION;
tl->tl_data_length = data->length;
tl->tl_data_contents = data->data;
princ->n_tl_data++;
ptl = &princ->tl_data;
while (*ptl != NULL)
ptl = &(*ptl)->tl_data_next;
*ptl = tl;
return;
}
static void
add_aliases(krb5_context context, kadm5_principal_ent_rec *princ,
struct getarg_strings *strings)
{
krb5_error_code ret;
HDB_extension ext;
krb5_data buf;
krb5_principal p;
size_t size;
int i;
memset(&ext, 0, sizeof(ext));
ext.mandatory = FALSE;
ext.data.element = choice_HDB_extension_data_aliases;
ext.data.u.aliases.case_insensitive = 0;
if (strings->num_strings == 1 && strings->strings[0][0] == '\0') {
ext.data.u.aliases.aliases.val = NULL;
ext.data.u.aliases.aliases.len = 0;
} else {
ext.data.u.aliases.aliases.val =
calloc(strings->num_strings,
sizeof(ext.data.u.aliases.aliases.val[0]));
ext.data.u.aliases.aliases.len = strings->num_strings;
for (i = 0; i < strings->num_strings; i++) {
ret = krb5_parse_name(context, strings->strings[i], &p);
ret = copy_Principal(p, &ext.data.u.aliases.aliases.val[i]);
krb5_free_principal(context, p);
}
}
ASN1_MALLOC_ENCODE(HDB_extension, buf.data, buf.length,
&ext, &size, ret);
free_HDB_extension(&ext);
if (ret)
abort();
if (buf.length != size)
abort();
add_tl(princ, KRB5_TL_EXTENSION, &buf);
}
static int
do_mod_entry(krb5_principal principal, void *data)
{
@@ -59,7 +123,8 @@ do_mod_entry(krb5_principal principal, void *data)
e->pw_expiration_time_string ||
e->attributes_string ||
e->kvno_integer != -1 ||
e->constrained_delegation_string) {
e->constrained_delegation_string ||
e->alias_strings.num_strings) {
ret = set_entry(context, &princ, &mask,
e->max_ticket_life_string,
e->max_renewable_life_string,
@@ -72,7 +137,6 @@ do_mod_entry(krb5_principal principal, void *data)
}
if (e->constrained_delegation_string) {
HDB_extension ext;
krb5_tl_data *tl, **ptl;
krb5_data buf;
krb5_principal p;
size_t size;
@@ -97,20 +161,15 @@ do_mod_entry(krb5_principal principal, void *data)
if (buf.length != size)
abort();
tl = ecalloc(1, sizeof(*tl));
tl->tl_data_next = NULL;
tl->tl_data_type = KRB5_TL_EXTENSION;
tl->tl_data_length = buf.length;
tl->tl_data_contents = buf.data;
princ.n_tl_data++;
ptl = &princ.tl_data;
while (*ptl != NULL)
ptl = &(*ptl)->tl_data_next;
*ptl = tl;
add_tl(&princ, KRB5_TL_EXTENSION, &buf);
mask |= KADM5_TL_DATA;
}
if (e->alias_strings.num_strings) {
add_aliases(context, &princ, &e->alias_strings);
mask |= KADM5_TL_DATA;
}
} else
ret = edit_entry(&princ, &mask, NULL, 0);
if(ret == 0) {