Commit e7b1794c authored by Volker Lendecke's avatar Volker Lendecke Committed by Karolin Seeger

winbind: Fix overlapping id ranges

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13903Signed-off-by: 's avatarVolker Lendecke <vl@samba.org>
Reviewed-by: 's avatarChristof Schmitt <cs@samba.org>
Reviewed-by: 's avatarJeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Apr 24 02:25:56 UTC 2019 on sn-devel-184

(cherry picked from commit 3020050bdf9df077ec9a0e962a689557187174ac)
parent ac678f27
......@@ -346,4 +346,3 @@
# Disabling NTLM means you can't use samr to change the password
^samba.tests.ntlmdisabled.python\(ktest\).ntlmdisabled.NtlmDisabledTests.test_samr_change_password\(ktest\)
^samba.tests.ntlmdisabled.python\(ad_dc_no_ntlm\).ntlmdisabled.NtlmDisabledTests.test_ntlm_connection\(ad_dc_no_ntlm\)
^idmap.ad.Test gid lookup of Domain Admins in trusted domain.\(ad_member_idmap_ad\)
......@@ -299,7 +299,11 @@ static struct tevent_req *wb_xids2sids_dom_send(
continue;
}
if (state->cached[i]) {
/* already mapped */
/* already found in cache */
continue;
}
if (!is_null_sid(&state->all_sids[i])) {
/* already mapped in a previously asked domain */
continue;
}
state->dom_xids[state->num_dom_xids++] = id;
......@@ -366,7 +370,11 @@ static void wb_xids2sids_dom_done(struct tevent_req *subreq)
continue;
}
if (state->cached[i]) {
/* already mapped */
/* already found in cache */
continue;
}
if (!is_null_sid(&state->all_sids[i])) {
/* already mapped in a previously asked domain */
continue;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment