sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

Revert "Tiny logic simplification -- remove an else branch"

Browse Source 
This reverts commit 01c8c7bbf6.
This commit is contained in:
Volker Lendecke 2008-07-11 17:42:40 +02:00
parent 58bc04b31b
commit b0fe0c7ac1
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source/winbindd/winbindd_idmap.c
View File

@ -241,31 +241,33 @@ enum winbindd_result winbindd_dual_sids2xids(struct winbindd_domain *domain,
result = idmap_sids_to_unixids(ids, num);
if (!NT_STATUS_IS_OK(result)) {
DEBUG (2, ("idmap_sids_to_unixids returned an error: 0x%08x\n",
NT_STATUS_V(result)));
talloc_free(ids);
return WINBINDD_ERROR;
}
if (NT_STATUS_IS_OK(result)) {
xids = SMB_MALLOC_ARRAY(struct unixid, num);
if ( ! xids) {
DEBUG(0, ("Out of memory!\n"));
talloc_free(ids);
return WINBINDD_ERROR;
}
for (i = 0; i < num; i++) {
if (ids[i]->status == ID_MAPPED) {
xids[i].type = ids[i]->xid.type;
xids[i].id = ids[i]->xid.id;
} else {
xids[i].type = -1;
xids = SMB_MALLOC_ARRAY(struct unixid, num);
if ( ! xids) {
DEBUG(0, ("Out of memory!\n"));
talloc_free(ids);
return WINBINDD_ERROR;
}
for (i = 0; i < num; i++) {
if (ids[i]->status == ID_MAPPED) {
xids[i].type = ids[i]->xid.type;
xids[i].id = ids[i]->xid.id;
} else {
xids[i].type = -1;
}
}
state->response.length = sizeof(state->response) + (sizeof(struct unixid) * num);
state->response.extra_data.data = xids;
} else {
DEBUG (2, ("idmap_sids_to_unixids returned an error: 0x%08x\n", NT_STATUS_V(result)));
talloc_free(ids);
return WINBINDD_ERROR;
}
state->response.length = sizeof(state->response) + (sizeof(struct unixid) * num);
state->response.extra_data.data = xids;
talloc_free(ids);
return WINBINDD_OK;
}