1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00

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

This reverts commit 01c8c7bbf6.
This commit is contained in:
Volker Lendecke 2008-07-11 17:42:40 +02:00
parent 58bc04b31b
commit b0fe0c7ac1

View File

@ -241,12 +241,7 @@ enum winbindd_result winbindd_dual_sids2xids(struct winbindd_domain *domain,
result = idmap_sids_to_unixids(ids, num); result = idmap_sids_to_unixids(ids, num);
if (!NT_STATUS_IS_OK(result)) { 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;
}
xids = SMB_MALLOC_ARRAY(struct unixid, num); xids = SMB_MALLOC_ARRAY(struct unixid, num);
if ( ! xids) { if ( ! xids) {
@ -266,6 +261,13 @@ enum winbindd_result winbindd_dual_sids2xids(struct winbindd_domain *domain,
state->response.length = sizeof(state->response) + (sizeof(struct unixid) * num); state->response.length = sizeof(state->response) + (sizeof(struct unixid) * num);
state->response.extra_data.data = xids; 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;
}
talloc_free(ids); talloc_free(ids);
return WINBINDD_OK; return WINBINDD_OK;
} }