Merge tag 'upstream/4.0.5+dfsg1' into samba_4.0_ivo

[abartlet/samba-debian.git] / source3 / winbindd / wb_next_pwent.c

diff --git a/source3/winbindd/wb_next_pwent.c b/source3/winbindd/wb_next_pwent.c
index 8104568d7acfb6303aae48afde8850cfebeaba8f..785658d4beca558a97a56ffae86cdf2892f5d493 100644 (file)
--- a/source3/winbindd/wb_next_pwent.c
+++ b/source3/winbindd/wb_next_pwent.c
@@ -40,14 +40,9 @@ static struct winbindd_domain *wb_next_find_domain(struct winbindd_domain *domai
        }
 
        if ((domain != NULL)
-           && sid_check_is_domain(&domain->sid)) {
+           && sid_check_is_our_sam(&domain->sid)) {
                domain = domain->next;
        }
-
-       if (domain == NULL) {
-               return NULL;
-       }
-
        return domain;
 }
 
@@ -119,7 +114,7 @@ static void wb_next_pwent_fetch_done(struct tevent_req *subreq)
                state->gstate->domain = state->gstate->domain->next;
 
                if ((state->gstate->domain != NULL)
-                   && sid_check_is_domain(&state->gstate->domain->sid)) {
+                   && sid_check_is_our_sam(&state->gstate->domain->sid)) {
                        state->gstate->domain = state->gstate->domain->next;
                }