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

more netinfo stuff

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3051 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-08-18 11:48:22 +00:00
parent fa48489789
commit 36cdde29ee
1 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/krb5/config_file.c
View File

@@ -49,21 +49,32 @@ RCSID("$Id$");
static ni_status static ni_status
ni_proplist2binding(ni_proplist *pl, krb5_config_section **ret) ni_proplist2binding(ni_proplist *pl, krb5_config_section **ret)
{ {
int i; int i, j;
krb5_config_section **next = NULL;
for (i = 0; i < pl->ni_proplist_len; i++) { for (i = 0; i < pl->ni_proplist_len; i++) {
if (!strcmp(pl->nipl_val[i].nip_name, "name"))
continue;
for (j = 0; j < pl->nipl_val[i].nip_val.ni_namelist_len; j++) {
krb5_config_binding *b; krb5_config_binding *b;
if (!strcmp(pl->nipl_val[i].nip_name, "name")) continue;
b = malloc(sizeof(*b)); b = malloc(sizeof(*b));
if (b == NULL) return NI_FAILED; if (b == NULL)
if (i == pl->ni_proplist_len) return NI_FAILED;
b->next = NULL; b->next = NULL;
else
b->next = *ret;
b->type = STRING; b->type = STRING;
b->name = ni_name_dup(pl->nipl_val[i].nip_name); b->name = ni_name_dup(pl->nipl_val[i].nip_name);
b->u.string = ni_name_dup(pl->nipl_val[i].nip_val.ninl_val[0]); b->u.string = ni_name_dup(pl->nipl_val[i].nip_val.ninl_val[j]);
if (next == NULL) {
*ret = b; *ret = b;
} else {
*next = b;
}
next = &b->next;
}
} }
return NI_OK; return NI_OK;
} }
@@ -104,18 +115,20 @@ ni_idlist2binding(void *ni, ni_idlist *idlist, krb5_config_section **ret)
b->name = ni_name_dup(pl.nipl_val[index].nip_val.ninl_val[0]); b->name = ni_name_dup(pl.nipl_val[index].nip_val.ninl_val[0]);
b->next = NULL; b->next = NULL;
b->u.list = NULL; b->u.list = NULL;
nis = ni_proplist2binding(&pl, &b->u.list);
ni_proplist_free(&pl);
if (nis != NI_OK) return nis;
/* get the child directories */
nis = ni_children(ni, &nid, &children); nis = ni_children(ni, &nid, &children);
if (nis == NI_OK) { if (nis == NI_OK) {
krb5_config_binding **node; nis = ni_idlist2binding(ni, &children, &b->u.list);
if (b->u.list == NULL) if (nis != NI_OK) {
node = &b->u.list; return nis;
else }
node = &b->u.list->next; }
nis = ni_idlist2binding(ni, &children, node);
nis = ni_proplist2binding(&pl, b->u.list == NULL ? &b->u.list : &b->u.list->next);
ni_proplist_free(&pl);
if (nis != NI_OK) {
return nis;
} }
next = &b->next; next = &b->next;
} }