sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

winbind: Simplify _wbint_Sids2UnixIDs

Browse Source 
Same number of lines, but from my point of view quite a bit simpler now
that we only have to handle one domain.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2015-12-29 21:33:20 +00:00 committed by Ralph Boehme
parent 2b1dd01934
commit 4d5680e9ae
1 changed files with 76 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
source3/winbindd/winbindd_dual_srv.c
View File

@ -121,102 +121,103 @@ NTSTATUS _wbint_LookupName(struct pipes_struct *p, struct wbint_LookupName *r)
NTSTATUS _wbint_Sids2UnixIDs(struct pipes_struct *p,
struct wbint_Sids2UnixIDs *r)
{
uint32_t i, j;
struct id_map *ids = NULL;
struct id_map **id_ptrs = NULL;
uint32_t i;
struct lsa_DomainInfo *d;
struct wbint_TransID *ids;
uint32_t num_ids;
struct id_map *id_maps = NULL;
struct id_map **id_map_ptrs = NULL;
struct dom_sid *sids = NULL;
uint32_t *id_idx = NULL;
struct idmap_domain *dom;
NTSTATUS status = NT_STATUS_NO_MEMORY;
for (i=0; i<r->in.domains->count; i++) {
struct lsa_DomainInfo *d = &r->in.domains->domains[i];
struct idmap_domain *dom;
uint32_t num_ids;
if (r->in.domains->count != 1) {
return NT_STATUS_INVALID_PARAMETER;
}
dom = idmap_find_domain_with_sid(d->name.string, d->sid);
if (dom == NULL) {
DEBUG(10, ("idmap domain %s:%s not found\n",
d->name.string, sid_string_dbg(d->sid)));
continue;
d = &r->in.domains->domains[0];
ids = r->in.ids->ids;
num_ids = r->in.ids->num_ids;
dom = idmap_find_domain_with_sid(d->name.string, d->sid);
if (dom == NULL) {
DEBUG(10, ("idmap domain %s:%s not found\n",
d->name.string, sid_string_dbg(d->sid)));
for (i=0; i<num_ids; i++) {
ids[i].xid = (struct unixid) {
.id = UINT32_MAX,
.type = ID_TYPE_NOT_SPECIFIED
};
}
num_ids = 0;
return NT_STATUS_OK;
}
for (j=0; j<r->in.ids->num_ids; j++) {
if (r->in.ids->ids[j].domain_index == i) {
num_ids += 1;
}
}
id_maps = talloc_array(talloc_tos(), struct id_map, num_ids);
if (id_maps == NULL) {
goto nomem;
}
id_map_ptrs = talloc_array(talloc_tos(), struct id_map *, num_ids+1);
if (id_map_ptrs == NULL) {
goto nomem;
}
sids = talloc_array(talloc_tos(), struct dom_sid, num_ids);
if (sids == NULL) {
goto nomem;
}
ids = talloc_realloc(talloc_tos(), ids,
struct id_map, num_ids);
if (ids == NULL) {
goto nomem;
}
id_ptrs = talloc_realloc(talloc_tos(), id_ptrs,
struct id_map *, num_ids+1);
if (id_ptrs == NULL) {
goto nomem;
}
id_idx = talloc_realloc(talloc_tos(), id_idx,
uint32_t, num_ids);
if (id_idx == NULL) {
goto nomem;
}
sids = talloc_realloc(talloc_tos(), sids,
struct dom_sid, num_ids);
if (sids == NULL) {
goto nomem;
}
/*
* Convert the input data into a list of id_map structs
* suitable for handing in to the idmap sids_to_unixids
* method.
*/
num_ids = 0;
for (i=0; i<num_ids; i++) {
/*
* Convert the input data into a list of
* id_map structs suitable for handing in
* to the idmap sids_to_unixids method.
*/
for (j=0; j<r->in.ids->num_ids; j++) {
struct wbint_TransID *id = &r->in.ids->ids[j];
sid_compose(&sids[i], d->sid, ids[i].rid);
if (id->domain_index != i) {
continue;
}
id_idx[num_ids] = j;
id_ptrs[num_ids] = &ids[num_ids];
id_maps[i] = (struct id_map) {
.sid = &sids[i],
.xid.type = ids[i].type,
.status = ID_UNKNOWN
};
ids[num_ids].sid = &sids[num_ids];
sid_compose(ids[num_ids].sid, d->sid, id->rid);
ids[num_ids].xid.type = id->type;
ids[num_ids].status = ID_UNKNOWN;
num_ids += 1;
}
id_ptrs[num_ids] = NULL;
id_map_ptrs[i] = &id_maps[i];
}
id_map_ptrs[num_ids] = NULL;
status = dom->methods->sids_to_unixids(dom, id_ptrs);
status = dom->methods->sids_to_unixids(dom, id_map_ptrs);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("sids_to_unixids returned %s\n",
nt_errstr(status)));
goto done;
}
/*
* Extract the results for handing them back to the caller.
*/
for (j=0; j<num_ids; j++) {
struct wbint_TransID *id = &r->in.ids->ids[id_idx[j]];
/*
* Extract the results for handing them back to the caller.
*/
if (ids[j].status != ID_MAPPED) {
id->xid.id = UINT32_MAX;
id->xid.type = ID_TYPE_NOT_SPECIFIED;
continue;
}
for (i=0; i<num_ids; i++) {
id->xid = ids[j].xid;
if (id_maps[i].status == ID_MAPPED) {
ids[i].xid = id_maps[i].xid;
} else {
ids[i].xid.id = UINT32_MAX;
ids[i].xid.type = ID_TYPE_NOT_SPECIFIED;
}
}
status = NT_STATUS_OK;
goto done;
nomem:
TALLOC_FREE(ids);
TALLOC_FREE(id_ptrs);
TALLOC_FREE(id_idx);
status = NT_STATUS_NO_MEMORY;
done:
TALLOC_FREE(id_maps);
TALLOC_FREE(id_map_ptrs);
TALLOC_FREE(sids);
return status;
}