summaryrefslogtreecommitdiff
path: root/source3/winbindd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-02-28 14:38:14 +0100
committerVolker Lendecke <vl@samba.org>2010-02-28 14:40:25 +0100
commit0e9882a65e91e4ab55dc103c7f6aec4ccd966db0 (patch)
tree359061dade372995cf2496b464479387d826e7c5 /source3/winbindd
parent99fc004e409ba5e535f1662e92370952777e55ff (diff)
downloadsamba-0e9882a65e91e4ab55dc103c7f6aec4ccd966db0.tar.gz
samba-0e9882a65e91e4ab55dc103c7f6aec4ccd966db0.tar.bz2
samba-0e9882a65e91e4ab55dc103c7f6aec4ccd966db0.zip
s3: Fix but 7145 -- duplicate sam and unix accounts
For me this survives the TESTS=posix_s3 POSIX_SUBTESTS="RPC-SAMR-LARGE-DC LOCAL-NSS-WRAPPER" make test reproducer. Günther, please check! Volker
Diffstat (limited to 'source3/winbindd')
-rw-r--r--source3/winbindd/wb_next_grent.c11
-rw-r--r--source3/winbindd/wb_next_pwent.c11
2 files changed, 22 insertions, 0 deletions
diff --git a/source3/winbindd/wb_next_grent.c b/source3/winbindd/wb_next_grent.c
index 5f81bca718..0e9dbd56d4 100644
--- a/source3/winbindd/wb_next_grent.c
+++ b/source3/winbindd/wb_next_grent.c
@@ -59,6 +59,11 @@ struct tevent_req *wb_next_grent_send(TALLOC_CTX *mem_ctx,
state->gstate->domain = state->gstate->domain->next;
}
+ if ((state->gstate->domain != NULL)
+ && sid_check_is_domain(&state->gstate->domain->sid)) {
+ state->gstate->domain = state->gstate->domain->next;
+ }
+
if (state->gstate->domain == NULL) {
tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
return tevent_req_post(req, ev);
@@ -109,6 +114,12 @@ static void wb_next_grent_fetch_done(struct tevent_req *subreq)
if (state->gstate->num_groups == 0) {
state->gstate->domain = state->gstate->domain->next;
+
+ if ((state->gstate->domain != NULL)
+ && sid_check_is_domain(&state->gstate->domain->sid)) {
+ state->gstate->domain = state->gstate->domain->next;
+ }
+
if (state->gstate->domain == NULL) {
tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
return;
diff --git a/source3/winbindd/wb_next_pwent.c b/source3/winbindd/wb_next_pwent.c
index 25ab7b38d3..fbaaa48b6b 100644
--- a/source3/winbindd/wb_next_pwent.c
+++ b/source3/winbindd/wb_next_pwent.c
@@ -55,6 +55,11 @@ struct tevent_req *wb_next_pwent_send(TALLOC_CTX *mem_ctx,
state->gstate->domain = state->gstate->domain->next;
}
+ if ((state->gstate->domain != NULL)
+ && sid_check_is_domain(&state->gstate->domain->sid)) {
+ state->gstate->domain = state->gstate->domain->next;
+ }
+
if (state->gstate->domain == NULL) {
tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
return tevent_req_post(req, ev);
@@ -101,6 +106,12 @@ static void wb_next_pwent_fetch_done(struct tevent_req *subreq)
if (state->gstate->num_users == 0) {
state->gstate->domain = state->gstate->domain->next;
+
+ if ((state->gstate->domain != NULL)
+ && sid_check_is_domain(&state->gstate->domain->sid)) {
+ state->gstate->domain = state->gstate->domain->next;
+ }
+
if (state->gstate->domain == NULL) {
tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
return;