s3:winbind: Convert WINBINDD_GETSIDALIASES to the new API

diff --git a/source3/Makefile.in b/source3/Makefile.in
index b1053bce05194719634bf8bcf31c4f0233f3ee7d..7879d939f852e622416cf15684e57303ffe55639 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1170,6 +1170,7 @@ WINBINDD_OBJ1 = \
                winbindd/winbindd_getpwsid.o \
                winbindd/winbindd_getpwnam.o \
                winbindd/winbindd_getpwuid.o \
+               winbindd/winbindd_getsidaliases.o \
                auth/token_util.o \
                ../nsswitch/libwbclient/wb_reqtrans.o \
                smbd/connection.o

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 0e13516a7191639f8f64057dacbbd73614e854ad..9d37a008ed4e6648e4aed89915d9f9fadd2da1d0 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -435,8 +435,6 @@ static struct winbindd_dispatch_table {
        { WINBINDD_GETUSERSIDS, winbindd_getusersids, "GETUSERSIDS" },
        { WINBINDD_GETUSERDOMGROUPS, winbindd_getuserdomgroups,
          "GETUSERDOMGROUPS" },
-       { WINBINDD_GETSIDALIASES, winbindd_getsidaliases,
-          "LOOKUPUSERALIASES" },
 
        /* Group functions */
 
@@ -533,6 +531,8 @@ static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
          winbindd_getpwnam_send, winbindd_getpwnam_recv },
        { WINBINDD_GETPWUID, "GETPWUID",
          winbindd_getpwuid_send, winbindd_getpwuid_recv },
+       { WINBINDD_GETSIDALIASES, "GETSIDALIASES",
+         winbindd_getsidaliases_send, winbindd_getsidaliases_recv },
 
        { 0, NULL, NULL, NULL }
 };

diff --git a/source3/winbindd/winbindd_getsidaliases.c b/source3/winbindd/winbindd_getsidaliases.c
new file mode 100644 (file)
index 0000000..788c88f
--- /dev/null
+++ b/source3/winbindd/winbindd_getsidaliases.c
@@ -0,0 +1,137 @@
+/*
+   Unix SMB/CIFS implementation.
+   async implementation of WINBINDD_GETSIDALIASES
+   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_getsidaliases_state {
+       struct dom_sid sid;
+       uint32_t num_aliases;
+       uint32_t *aliases;
+};
+
+static void winbindd_getsidaliases_done(struct tevent_req *subreq);
+
+struct tevent_req *winbindd_getsidaliases_send(TALLOC_CTX *mem_ctx,
+                                              struct tevent_context *ev,
+                                              struct winbindd_request *request)
+{
+       struct tevent_req *req, *subreq;
+       struct winbindd_getsidaliases_state *state;
+       struct winbindd_domain *domain;
+       size_t num_sids;
+       struct dom_sid *sids;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct winbindd_getsidaliases_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       /* Ensure null termination */
+       request->data.sid[sizeof(request->data.sid)-1]='\0';
+
+       DEBUG(3, ("getsidaliases %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);
+       }
+
+       domain = find_domain_from_sid_noinit(&state->sid);
+       if (domain == NULL) {
+               DEBUG(1,("could not find domain entry for sid %s\n",
+                        request->data.sid));
+               tevent_req_nterror(req, NT_STATUS_NO_SUCH_DOMAIN);
+               return tevent_req_post(req, ev);
+       }
+
+       num_sids = 0;
+       sids = NULL;
+
+       if ((request->extra_data.data != NULL)
+           && !parse_sidlist(state, request->extra_data.data,
+                             &sids, &num_sids)) {
+               DEBUG(1, ("Could not parse SID list: %s\n",
+                         request->extra_data.data));
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return tevent_req_post(req, ev);
+       }
+
+       subreq = wb_lookupuseraliases_send(state, ev, domain, num_sids, sids);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, winbindd_getsidaliases_done, req);
+       return req;
+}
+
+static void winbindd_getsidaliases_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct winbindd_getsidaliases_state *state = tevent_req_data(
+               req, struct winbindd_getsidaliases_state);
+       NTSTATUS status;
+
+       status = wb_lookupuseraliases_recv(subreq, state, &state->num_aliases,
+                                          &state->aliases);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
+       }
+       tevent_req_done(req);
+}
+
+NTSTATUS winbindd_getsidaliases_recv(struct tevent_req *req,
+                                    struct winbindd_response *response)
+{
+       struct winbindd_getsidaliases_state *state = tevent_req_data(
+               req, struct winbindd_getsidaliases_state);
+       NTSTATUS status;
+       int i;
+       char *sidlist;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               return status;
+       }
+
+       sidlist = talloc_strdup(response, "");
+       if (sidlist == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       for (i=0; i<state->num_aliases; i++) {
+               struct dom_sid sid;
+               fstring tmp;
+               sid_compose(&sid, &state->sid, state->aliases[i]);
+
+               sidlist = talloc_asprintf_append_buffer(
+                       sidlist, "%s\n", sid_to_fstring(tmp, &sid));
+               if (sidlist == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+       }
+       response->extra_data.data = sidlist;
+       response->length += talloc_get_size(sidlist);
+       response->data.num_entries = state->num_aliases;
+       return NT_STATUS_OK;
+}

diff --git a/source3/winbindd/winbindd_group.c b/source3/winbindd/winbindd_group.c
index f78becb69902da0e6b00d44e5187b4c1c4b00556..0d3db1d83fa463fa7b95c2f1df6021e6a7be97d8 100644 (file)
--- a/source3/winbindd/winbindd_group.c
+++ b/source3/winbindd/winbindd_group.c
@@ -1887,32 +1887,6 @@ enum winbindd_result winbindd_dual_getuserdomgroups(struct winbindd_domain *doma
        return WINBINDD_OK;
 }
 
-void winbindd_getsidaliases(struct winbindd_cli_state *state)
-{
-       DOM_SID domain_sid;
-       struct winbindd_domain *domain;
-
-       /* Ensure null termination */
-       state->request->data.sid[sizeof(state->request->data.sid)-1]='\0';
-
-       if (!string_to_sid(&domain_sid, state->request->data.sid)) {
-               DEBUG(1, ("Could not get convert sid %s from string\n",
-                         state->request->data.sid));
-               request_error(state);
-               return;
-       }
-
-       /* Get info for the domain */
-       if ((domain = find_domain_from_sid_noinit(&domain_sid)) == NULL) {
-               DEBUG(0,("could not find domain entry for sid %s\n",
-                        sid_string_dbg(&domain_sid)));
-               request_error(state);
-               return;
-       }
-
-       sendto_domain(state, domain);
-}
-
 enum winbindd_result winbindd_dual_getsidaliases(struct winbindd_domain *domain,
                                                 struct winbindd_cli_state *state)
 {

diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 8dda3f8c8fbf2645de3d26cde23338088ee7e028..f008ecda1970689c3ae84ce419468e1ce08d8575 100644 (file)
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -733,6 +733,11 @@ struct tevent_req *wb_lookupuseraliases_send(TALLOC_CTX *mem_ctx,
                                             const struct dom_sid *sids);
 NTSTATUS wb_lookupuseraliases_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
                                   uint32_t *num_aliases, uint32_t **aliases);
+struct tevent_req *winbindd_getsidaliases_send(TALLOC_CTX *mem_ctx,
+                                              struct tevent_context *ev,
+                                              struct winbindd_request *request);
+NTSTATUS winbindd_getsidaliases_recv(struct tevent_req *req,
+                                    struct winbindd_response *response);
 
 
 #endif /*  _WINBINDD_PROTO_H_  */