s3:winbind: Add async wb_next_grent

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6febc971a197ae7b0f37fb3eaecbbdf2c75cba34..bea41ff3b0574653cdbb338cb773ce2e74970b41 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1182,6 +1182,7 @@ WINBINDD_OBJ1 = \
                winbindd/wb_query_user_list.o \
                winbindd/wb_fill_pwent.o \
                winbindd/wb_next_pwent.o \
+               winbindd/wb_next_grent.o \
                winbindd/wb_dsgetdcname.o \
                winbindd/winbindd_lookupsid.o \
                winbindd/winbindd_lookupname.o \

diff --git a/source3/winbindd/wb_next_grent.c b/source3/winbindd/wb_next_grent.c
new file mode 100644 (file)
index 0000000..5f81bca
--- /dev/null
+++ b/source3/winbindd/wb_next_grent.c
@@ -0,0 +1,177 @@
+/*
+   Unix SMB/CIFS implementation.
+   async next_grent
+   Copyright (C) Volker Lendecke 2009
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "winbindd.h"
+#include "librpc/gen_ndr/cli_wbint.h"
+
+struct wb_next_grent_state {
+       struct tevent_context *ev;
+       int max_nesting;
+       struct getgrent_state *gstate;
+       struct wbint_Principals next_groups;
+       struct winbindd_gr *gr;
+       struct talloc_dict *members;
+};
+
+static void wb_next_grent_fetch_done(struct tevent_req *subreq);
+static void wb_next_grent_getgrsid_done(struct tevent_req *subreq);
+
+struct tevent_req *wb_next_grent_send(TALLOC_CTX *mem_ctx,
+                                     struct tevent_context *ev,
+                                     int max_nesting,
+                                     struct getgrent_state *gstate,
+                                     struct winbindd_gr *gr)
+{
+       struct tevent_req *req, *subreq;
+       struct wb_next_grent_state *state;
+
+       req = tevent_req_create(mem_ctx, &state, struct wb_next_grent_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->ev = ev;
+       state->gstate = gstate;
+       state->gr = gr;
+
+       if (state->gstate->next_group >= state->gstate->num_groups) {
+               TALLOC_FREE(state->gstate->groups);
+
+               if (state->gstate->domain == NULL) {
+                       state->gstate->domain = domain_list();
+               } else {
+                       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);
+               }
+               subreq = rpccli_wbint_QueryGroupList_send(
+                       state, state->ev, state->gstate->domain->child.rpccli,
+                       &state->next_groups);
+               if (tevent_req_nomem(subreq, req)) {
+                       return tevent_req_post(req, ev);
+               }
+               tevent_req_set_callback(subreq, wb_next_grent_fetch_done, req);
+               return req;
+       }
+
+       subreq = wb_getgrsid_send(
+               state, state->ev,
+               &state->gstate->groups[state->gstate->next_group].sid,
+               state->max_nesting);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, wb_next_grent_getgrsid_done, req);
+       return req;
+}
+
+static void wb_next_grent_fetch_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct wb_next_grent_state *state = tevent_req_data(
+               req, struct wb_next_grent_state);
+       NTSTATUS status, result;
+
+       status = rpccli_wbint_QueryGroupList_recv(subreq, state, &result);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status) || !NT_STATUS_IS_OK(result)) {
+               /* Ignore errors here, just log it */
+               DEBUG(10, ("query_user_list for domain %s returned %s/%s\n",
+                          state->gstate->domain->name,
+                          nt_errstr(status), nt_errstr(result)));
+               tevent_req_nterror(req, result);
+               return;
+       }
+
+       state->gstate->num_groups = state->next_groups.num_principals;
+       state->gstate->groups = talloc_move(
+               state->gstate, &state->next_groups.principals);
+
+       if (state->gstate->num_groups == 0) {
+               state->gstate->domain = state->gstate->domain->next;
+               if (state->gstate->domain == NULL) {
+                       tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
+                       return;
+               }
+               subreq = rpccli_wbint_QueryGroupList_send(
+                       state, state->ev, state->gstate->domain->child.rpccli,
+                       &state->next_groups);
+               if (tevent_req_nomem(subreq, req)) {
+                       return;
+               }
+               tevent_req_set_callback(subreq, wb_next_grent_fetch_done, req);
+               return;
+       }
+
+       state->gstate->next_group = 0;
+
+       subreq = wb_getgrsid_send(
+               state, state->ev,
+               &state->gstate->groups[state->gstate->next_group].sid,
+               state->max_nesting);
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq, wb_next_grent_getgrsid_done, req);
+       return;
+}
+
+static void wb_next_grent_getgrsid_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct wb_next_grent_state *state = tevent_req_data(
+               req, struct wb_next_grent_state);
+       const char *domname, *name;
+       NTSTATUS status;
+
+       status = wb_getgrsid_recv(subreq, talloc_tos(), &domname, &name,
+                                 &state->gr->gr_gid, &state->members);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
+       }
+       if (!fill_grent(talloc_tos(), state->gr, domname, name,
+                       state->gr->gr_gid)) {
+               DEBUG(5, ("fill_grent failed\n"));
+               tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
+               return;
+       }
+       state->gstate->next_group += 1;
+       tevent_req_done(req);
+}
+
+NTSTATUS wb_next_grent_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                           struct talloc_dict **members)
+{
+       struct wb_next_grent_state *state = tevent_req_data(
+               req, struct wb_next_grent_state);
+       NTSTATUS status;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               return status;
+       }
+       *members = talloc_move(mem_ctx, &state->members);
+       return NT_STATUS_OK;
+}

diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h
index d199481a225d1a3b1d3eb6a253f89b8408533c87..b61017e513f3a7b31fd951fd06b2a93c42583179 100644 (file)
--- a/source3/winbindd/winbindd.h
+++ b/source3/winbindd/winbindd.h
@@ -68,6 +68,7 @@ struct winbindd_cli_state {
        struct getent_state *getgrent_state;      /* State for getgrent() */
 
        struct getpwent_state *pwent_state; /* State for getpwent() */
+       struct getgrent_state *grent_state; /* State for getgrent() */
 };
 
 /* State between get{pw,gr}ent() calls */
@@ -87,6 +88,13 @@ struct getpwent_state {
        struct wbint_userinfo *users;
 };
 
+struct getgrent_state {
+       struct winbindd_domain *domain;
+       int next_group;
+       int num_groups;
+       struct wbint_Principal *groups;
+};
+
 /* Storage for cached getpwent() user entries */
 
 struct getpwent_user {

diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index bebfc9d9e4bf75ca8aa5a6ee03c64e1e9d0b0ee8..689da8016d890f8d2db33bc387c162a4007661bd 100644 (file)
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -916,4 +916,12 @@ struct tevent_req *winbindd_getdcname_send(TALLOC_CTX *mem_ctx,
 NTSTATUS winbindd_getdcname_recv(struct tevent_req *req,
                                 struct winbindd_response *response);
 
+struct tevent_req *wb_next_grent_send(TALLOC_CTX *mem_ctx,
+                                     struct tevent_context *ev,
+                                     int max_nesting,
+                                     struct getgrent_state *gstate,
+                                     struct winbindd_gr *gr);
+NTSTATUS wb_next_grent_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                           struct talloc_dict **members);
+
 #endif /*  _WINBINDD_PROTO_H_  */