]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3:winbind: Convert WINBINDD_SID_TO_GID the new API
authorVolker Lendecke <vl@samba.org>
Tue, 4 Aug 2009 17:42:22 +0000 (13:42 -0400)
committerVolker Lendecke <vl@samba.org>
Wed, 5 Aug 2009 07:21:21 +0000 (03:21 -0400)
source3/Makefile.in
source3/winbindd/winbindd.c
source3/winbindd/winbindd_proto.h
source3/winbindd/winbindd_sid.c
source3/winbindd/winbindd_sid_to_gid.c [new file with mode: 0644]

index f0cc654af055ec89ed7d70461dec9689d920e5e8..9f5a7dedf715b29c336f9a4aca96c71c896c8bd0 100644 (file)
@@ -1159,6 +1159,7 @@ WINBINDD_OBJ1 = \
                winbindd/winbindd_lookupsid.o \
                winbindd/winbindd_lookupname.o \
                winbindd/winbindd_sid_to_uid.o \
+               winbindd/winbindd_sid_to_gid.o \
                auth/token_util.o \
                ../nsswitch/libwbclient/wb_reqtrans.o \
                smbd/connection.o
index 1d91a608c432d554bae6710a2f86d02e52d37749..0f320850d2ae40a25c722985beee06da0482bc31 100644 (file)
@@ -473,7 +473,6 @@ static struct winbindd_dispatch_table {
 
        /* Lookup related functions */
 
-       { WINBINDD_SID_TO_GID, winbindd_sid_to_gid, "SID_TO_GID" },
        { WINBINDD_UID_TO_SID, winbindd_uid_to_sid, "UID_TO_SID" },
        { WINBINDD_GID_TO_SID, winbindd_gid_to_sid, "GID_TO_SID" },
        { WINBINDD_ALLOCATE_UID, winbindd_allocate_uid, "ALLOCATE_UID" },
@@ -528,6 +527,8 @@ static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
          winbindd_lookupname_send, winbindd_lookupname_recv },
        { WINBINDD_SID_TO_UID, "SID_TO_UID",
          winbindd_sid_to_uid_send, winbindd_sid_to_uid_recv },
+       { WINBINDD_SID_TO_GID, "SID_TO_GID",
+         winbindd_sid_to_gid_send, winbindd_sid_to_gid_recv },
 
        { 0, NULL, NULL, NULL }
 };
index d26a85796d07da9a08acb7a7dd8e5a8724b3ab4e..d17d47a0d7015e3f4a311f63f2ab788b685a4dd3 100644 (file)
@@ -653,4 +653,10 @@ struct tevent_req *wb_sid2gid_send(TALLOC_CTX *mem_ctx,
                                   const struct dom_sid *sid);
 NTSTATUS wb_sid2gid_recv(struct tevent_req *req, gid_t *gid);
 
+struct tevent_req *winbindd_sid_to_gid_send(TALLOC_CTX *mem_ctx,
+                                           struct tevent_context *ev,
+                                           struct winbindd_request *request);
+NTSTATUS winbindd_sid_to_gid_recv(struct tevent_req *req,
+                                 struct winbindd_response *response);
+
 #endif /*  _WINBINDD_PROTO_H_  */
index ae3d369846ef724291eb7c97fa24a96d7d7b0e62..718345b5e38285f0da23df9f4ddb5f7074833b20 100644 (file)
@@ -55,119 +55,6 @@ void winbindd_lookuprids(struct winbindd_cli_state *state)
        sendto_domain(state, domain);
 }
 
-/* Convert a sid to a gid.  We assume we only have one rid attached to the
-   sid.*/
-
-static void sid2gid_recv(void *private_data, bool success, gid_t gid)
-{
-       struct winbindd_cli_state *state =
-               talloc_get_type_abort(private_data, struct winbindd_cli_state);
-       struct dom_sid sid;
-
-       string_to_sid(&sid, state->request->data.sid);
-
-       if (!success) {
-               DEBUG(5, ("Could not convert sid %s\n",
-                         state->request->data.sid));
-               request_error(state);
-               return;
-       }
-
-       state->response->data.gid = gid;
-       request_ok(state);
-}
-
-static void sid2gid_lookupsid_recv( void *private_data, bool success, 
-                                   const char *domain_name, 
-                                   const char *name, 
-                                   enum lsa_SidType type)
-{
-       struct winbindd_cli_state *state =
-               talloc_get_type_abort(private_data, struct winbindd_cli_state);
-       DOM_SID sid;
-
-       if (!string_to_sid(&sid, state->request->data.sid)) {
-               DEBUG(1, ("sid2gid_lookupsid_recv: Could not get convert sid "
-                         "%s from string\n", state->request->data.sid));
-               request_error(state);
-               return;
-       }
-
-       if (!success) {
-               DEBUG(5, ("sid2gid_lookupsid_recv: Could not get sid type for %s\n",
-                         state->request->data.sid));
-               goto fail;
-       }
-
-       if ( (type!=SID_NAME_DOM_GRP) &&
-            (type!=SID_NAME_ALIAS) && 
-            (type!=SID_NAME_WKN_GRP) ) 
-       {
-               DEBUG(5,("sid2gid_lookupsid_recv: Sid %s is not a group.\n", 
-                        state->request->data.sid));
-               goto fail;
-       }
-
-       /* always use the async interface (may block) */
-       winbindd_sid2gid_async(state->mem_ctx, &sid, sid2gid_recv, state);
-       return;
-
- fail:
-       /*
-        * We have to set the cache ourselves here, the child which is
-        * normally responsible was not queried yet.
-        */
-       idmap_cache_set_sid2gid(&sid, -1);
-       request_error(state);
-       return;
-}
-
-void winbindd_sid_to_gid(struct winbindd_cli_state *state)
-{
-       DOM_SID sid;
-       gid_t gid;
-       bool expired;
-
-       /* Ensure null termination */
-       state->request->data.sid[sizeof(state->request->data.sid)-1]='\0';
-
-       DEBUG(3, ("[%5lu]: sid to gid %s\n", (unsigned long)state->pid,
-                 state->request->data.sid));
-
-       if (!string_to_sid(&sid, state->request->data.sid)) {
-               DEBUG(1, ("Could not get convert sid %s from string\n",
-                         state->request->data.sid));
-               request_error(state);
-               return;
-       }
-
-       if (idmap_cache_find_sid2gid(&sid, &gid, &expired)) {
-               DEBUG(10, ("idmap_cache_find_sid2gid found %d%s\n",
-                          (int)gid, expired ? " (expired)": ""));
-               if (expired && IS_DOMAIN_ONLINE(find_our_domain())) {
-                       DEBUG(10, ("revalidating expired entry\n"));
-                       goto backend;
-               }
-               if (gid == -1) {
-                       DEBUG(10, ("Returning negative cache entry\n"));
-                       request_error(state);
-                       return;
-               }
-               DEBUG(10, ("Returning positive cache entry\n"));
-               state->response->data.gid = gid;
-               request_ok(state);
-               return;
-       }
-
-       /* Validate the SID as a group.  Hopefully this will hit cache.
-          Needed to prevent DoS by exhausting the uid allocation
-          range from random SIDs. */
-
- backend:
-       winbindd_lookupsid_async( state->mem_ctx, &sid, sid2gid_lookupsid_recv,
-                                 state );
-}
-
 static void set_mapping_recv(void *private_data, bool success)
 {
        struct winbindd_cli_state *state =
diff --git a/source3/winbindd/winbindd_sid_to_gid.c b/source3/winbindd/winbindd_sid_to_gid.c
new file mode 100644 (file)
index 0000000..323b44d
--- /dev/null
@@ -0,0 +1,94 @@
+/*
+   Unix SMB/CIFS implementation.
+   async implementation of WINBINDD_SID_TO_GID
+   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_sid_to_gid_state {
+       struct dom_sid sid;
+       gid_t gid;
+};
+
+static void winbindd_sid_to_gid_done(struct tevent_req *subreq);
+
+struct tevent_req *winbindd_sid_to_gid_send(TALLOC_CTX *mem_ctx,
+                                           struct tevent_context *ev,
+                                           struct winbindd_request *request)
+{
+       struct tevent_req *req, *subreq;
+       struct winbindd_sid_to_gid_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct winbindd_sid_to_gid_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       /* Ensure null termination */
+       request->data.sid[sizeof(request->data.sid)-1]='\0';
+
+       DEBUG(3, ("sid to gid %s\n", request->data.sid));
+
+       if (!string_to_sid(&state->sid, request->data.sid)) {
+               DEBUG(1, ("Could not get convert sid %s from string\n",
+                         request->data.sid));
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return tevent_req_post(req, ev);
+       }
+
+       subreq = wb_sid2gid_send(state, ev, &state->sid);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, winbindd_sid_to_gid_done, req);
+       return req;
+}
+
+static void winbindd_sid_to_gid_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct winbindd_sid_to_gid_state *state = tevent_req_data(
+               req, struct winbindd_sid_to_gid_state);
+       NTSTATUS status;
+
+       status = wb_sid2gid_recv(subreq, &state->gid);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
+       }
+       tevent_req_done(req);
+}
+
+NTSTATUS winbindd_sid_to_gid_recv(struct tevent_req *req,
+                                 struct winbindd_response *response)
+{
+       struct winbindd_sid_to_gid_state *state = tevent_req_data(
+               req, struct winbindd_sid_to_gid_state);
+       NTSTATUS status;
+
+       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;
+       }
+       response->data.gid = state->gid;
+       return NT_STATUS_OK;
+}