s3:winbind: Convert WINBINDD_GETGRGID to the new API
authorVolker Lendecke <vl@samba.org>
Sun, 16 Aug 2009 10:13:00 +0000 (12:13 +0200)
committerVolker Lendecke <vl@samba.org>
Sun, 16 Aug 2009 10:39:07 +0000 (12:39 +0200)
source3/Makefile.in
source3/winbindd/winbindd.c
source3/winbindd/winbindd_getgrgid.c [new file with mode: 0644]
source3/winbindd/winbindd_group.c
source3/winbindd/winbindd_proto.h

index 19cccf467aad35086ed62c97119ab9240382f467..d96dc2aaf18dcefd47e1e266c253e00eb7f5e43e 100644 (file)
@@ -1182,6 +1182,7 @@ WINBINDD_OBJ1 = \
                winbindd/winbindd_getuserdomgroups.o \
                winbindd/winbindd_getgroups.o \
                winbindd/winbindd_show_sequence.o \
+               winbindd/winbindd_getgrgid.o \
                auth/token_util.o \
                ../nsswitch/libwbclient/wb_reqtrans.o \
                smbd/connection.o
index 3dfdb03374cabb94f1df4594e8f09ba45ff42dda..bbcfede030b217a8da934d76be561801495a6e9c 100644 (file)
@@ -436,7 +436,6 @@ static struct winbindd_dispatch_table {
        /* Group functions */
 
        { WINBINDD_GETGRNAM, winbindd_getgrnam, "GETGRNAM" },
-       { WINBINDD_GETGRGID, winbindd_getgrgid, "GETGRGID" },
        { WINBINDD_SETGRENT, winbindd_setgrent, "SETGRENT" },
        { WINBINDD_ENDGRENT, winbindd_endgrent, "ENDGRENT" },
        { WINBINDD_GETGRENT, winbindd_getgrent, "GETGRENT" },
@@ -535,6 +534,8 @@ static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
          winbindd_getgroups_send, winbindd_getgroups_recv },
        { WINBINDD_SHOW_SEQUENCE, "SHOW_SEQUENCE",
          winbindd_show_sequence_send, winbindd_show_sequence_recv },
+       { WINBINDD_GETGRGID, "GETGRGID",
+         winbindd_getgrgid_send, winbindd_getgrgid_recv },
 
        { 0, NULL, NULL, NULL }
 };
diff --git a/source3/winbindd/winbindd_getgrgid.c b/source3/winbindd/winbindd_getgrgid.c
new file mode 100644 (file)
index 0000000..82204ad
--- /dev/null
@@ -0,0 +1,134 @@
+/*
+   Unix SMB/CIFS implementation.
+   async implementation of WINBINDD_GETGRGID
+   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"
+
+struct winbindd_getgrgid_state {
+       struct tevent_context *ev;
+       struct dom_sid sid;
+       const char *domname;
+       const char *name;
+       gid_t gid;
+       struct talloc_dict *members;
+};
+
+static void winbindd_getgrgid_gid2sid_done(struct tevent_req *subreq);
+static void winbindd_getgrgid_done(struct tevent_req *subreq);
+
+struct tevent_req *winbindd_getgrgid_send(TALLOC_CTX *mem_ctx,
+                                         struct tevent_context *ev,
+                                         struct winbindd_request *request)
+{
+       struct tevent_req *req, *subreq;
+       struct winbindd_getgrgid_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct winbindd_getgrgid_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->ev = ev;
+
+       DEBUG(3, ("getgrgid %d\n", (int)request->data.gid));
+
+       subreq = wb_gid2sid_send(state, ev, request->data.gid);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, winbindd_getgrgid_gid2sid_done,
+                               req);
+       return req;
+}
+
+static void winbindd_getgrgid_gid2sid_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct winbindd_getgrgid_state *state = tevent_req_data(
+               req, struct winbindd_getgrgid_state);
+       NTSTATUS status;
+
+       status = wb_gid2sid_recv(subreq, &state->sid);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
+       }
+
+       subreq = wb_getgrsid_send(state, state->ev, &state->sid,
+                                 lp_winbind_expand_groups());
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq, winbindd_getgrgid_done, req);
+}
+
+static void winbindd_getgrgid_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct winbindd_getgrgid_state *state = tevent_req_data(
+               req, struct winbindd_getgrgid_state);
+       NTSTATUS status;
+
+       status = wb_getgrsid_recv(subreq, state, &state->domname, &state->name,
+                                 &state->gid, &state->members);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
+       }
+       tevent_req_done(req);
+}
+
+NTSTATUS winbindd_getgrgid_recv(struct tevent_req *req,
+                               struct winbindd_response *response)
+{
+       struct winbindd_getgrgid_state *state = tevent_req_data(
+               req, struct winbindd_getgrgid_state);
+       NTSTATUS status;
+       int num_members;
+       char *buf;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               DEBUG(5, ("Could not convert sid %s: %s\n",
+                         sid_string_dbg(&state->sid), nt_errstr(status)));
+               return status;
+       }
+
+       if (!fill_grent(talloc_tos(), &response->data.gr, state->domname,
+                       state->name, state->gid)) {
+               DEBUG(5, ("fill_grent failed\n"));
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = winbindd_print_groupmembers(state->members, response,
+                                            &num_members, &buf);
+
+       response->data.gr.num_gr_mem = (uint32)num_members;
+
+       /* Group membership lives at start of extra data */
+
+       response->data.gr.gr_mem_ofs = 0;
+       response->extra_data.data = buf;
+       response->length += talloc_get_size(response->extra_data.data);
+
+       return NT_STATUS_OK;
+}
index 2893f571f44a72c28506c8c4321f784541af735f..f33b52f83fe15115622b1a056db9585463d9eb65 100644 (file)
@@ -1007,57 +1007,6 @@ static void winbindd_getgrsid( struct winbindd_cli_state *state, const DOM_SID g
                                  getgrsid_lookupsid_recv, s );
 }
 
-
-static void getgrgid_recv(void *private_data, bool success, const char *sid)
-{
-       struct winbindd_cli_state *state = talloc_get_type_abort(private_data, struct winbindd_cli_state);
-       enum lsa_SidType name_type;
-       DOM_SID group_sid;
-
-       if (success) {
-               DEBUG(10,("getgrgid_recv: gid %lu has sid %s\n",
-                         (unsigned long)(state->request->data.gid), sid));
-
-               if (!string_to_sid(&group_sid, sid)) {
-                       DEBUG(1,("getgrgid_recv: Could not convert sid %s "
-                               "from string\n", sid));
-                       request_error(state);
-                       return;
-               }
-
-               winbindd_getgrsid(state, group_sid);
-               return;
-       }
-
-       /* Ok, this might be "ours", i.e. an alias */
-       if (pdb_gid_to_sid(state->request->data.gid, &group_sid) &&
-           lookup_sid(state->mem_ctx, &group_sid, NULL, NULL, &name_type) &&
-           (name_type == SID_NAME_ALIAS)) {
-               /* Hey, got an alias */
-               DEBUG(10,("getgrgid_recv: we have an alias with gid %lu and sid %s\n",
-                         (unsigned long)(state->request->data.gid), sid));
-               winbindd_getgrsid(state, group_sid);
-               return;
-       }
-
-       DEBUG(1, ("could not convert gid %lu to sid\n",
-                 (unsigned long)state->request->data.gid));
-       request_error(state);
-}
-
-/* Return a group structure from a gid number */
-void winbindd_getgrgid(struct winbindd_cli_state *state)
-{
-       gid_t gid = state->request->data.gid;
-
-       DEBUG(3, ("[%5lu]: getgrgid %lu\n",
-                 (unsigned long)state->pid,
-                 (unsigned long)gid));
-
-       /* always use the async interface */
-       winbindd_gid2sid_async(state->mem_ctx, gid, getgrgid_recv, state);
-}
-
 /*
  * set/get/endgrent functions
  */
index 6bb3406f7865f0f6c102932d7dcbdb499ca52b23..f68cc2ec40f56b26cc36ba9def3114758851dfd1 100644 (file)
@@ -811,4 +811,10 @@ NTSTATUS wb_getgrsid_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
                          const char **domname, const char **name, gid_t *gid,
                          struct talloc_dict **members);
 
+struct tevent_req *winbindd_getgrgid_send(TALLOC_CTX *mem_ctx,
+                                         struct tevent_context *ev,
+                                         struct winbindd_request *request);
+NTSTATUS winbindd_getgrgid_recv(struct tevent_req *req,
+                               struct winbindd_response *response);
+
 #endif /*  _WINBINDD_PROTO_H_  */