summaryrefslogtreecommitdiff
path: root/source3/winbindd/wb_lookupsids.c
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2017-03-24 16:46:40 +0100
committerJeremy Allison <jra@samba.org>2017-04-12 01:41:14 +0200
commitc79a5acf201f1b779a4fc833a45a9ee658f8cb31 (patch)
treefec565f9357966f1da4cb45e4bf6bfa753974be9 /source3/winbindd/wb_lookupsids.c
parent32e752e145395c8dbe73c90250ce471ab6744e8b (diff)
downloadsamba-c79a5acf201f1b779a4fc833a45a9ee658f8cb31.tar.gz
winbindd: remove fallback to lookupsid for unknown SIDs
In wb_lookupsids_done() if a SID failed with lookupsids(), remove the hokey retry via lookupsid(). The retry logic with going through the single sids lookup at the end added a fake domain with an empty string. The wb_lookupsids caller wb_sids2xids needed this, as it wasn't doing the needed error handling itself. As wb_sids2xids has been fixed to cope, we can just fail the lookupsids here. Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/winbindd/wb_lookupsids.c')
-rw-r--r--source3/winbindd/wb_lookupsids.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/source3/winbindd/wb_lookupsids.c b/source3/winbindd/wb_lookupsids.c
index dbb24fde0aa..219afb38c92 100644
--- a/source3/winbindd/wb_lookupsids.c
+++ b/source3/winbindd/wb_lookupsids.c
@@ -507,19 +507,8 @@ static void wb_lookupsids_done(struct tevent_req *subreq)
*/
for (i=0; i<state->tmp_names.count; i++) {
-
uint32_t res_sid_index = d->sid_indexes[i];
- if (state->tmp_names.names[i].sid_type == SID_NAME_UNKNOWN) {
- /*
- * Make unknown SIDs go through
- * wb_lookupsid. This retries the forest root.
- */
- state->single_sids[state->num_single_sids] =
- res_sid_index;
- state->num_single_sids += 1;
- continue;
- }
if (!wb_lookupsids_move_name(
&state->tmp_domains, &state->tmp_names.names[i],
state->res_domains, state->res_names,