s3:winbind: Convert WINBINDD_GETPWSID to the new API

diff --git a/source3/Makefile.in b/source3/Makefile.in
index ec47eccd4bba583325c71ab9df080cc80ecf11ca..f5fba5e38b05a2b9592150db1518f5d9ec3e861e 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1166,6 +1166,7 @@ WINBINDD_OBJ1 = \
                winbindd/winbindd_sid_to_gid.o \
                winbindd/winbindd_uid_to_sid.o \
                winbindd/winbindd_gid_to_sid.o \
+               winbindd/winbindd_getpwsid.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 4425517385fbec352363b409b614c8f3d4b4a64b..77e073c7c3d5751835781298543c38bb017f3045 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -429,7 +429,6 @@ static struct winbindd_dispatch_table {
 
        { WINBINDD_GETPWNAM, winbindd_getpwnam, "GETPWNAM" },
        { WINBINDD_GETPWUID, winbindd_getpwuid, "GETPWUID" },
-       { WINBINDD_GETPWSID, winbindd_getpwsid, "GETPWSID" },
 
        { WINBINDD_SETPWENT, winbindd_setpwent, "SETPWENT" },
        { WINBINDD_ENDPWENT, winbindd_endpwent, "ENDPWENT" },
@@ -531,6 +530,8 @@ static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
          winbindd_uid_to_sid_send, winbindd_uid_to_sid_recv },
        { WINBINDD_GID_TO_SID, "GID_TO_SID",
          winbindd_gid_to_sid_send, winbindd_gid_to_sid_recv },
+       { WINBINDD_GETPWSID, "GETPWSID",
+         winbindd_getpwsid_send, winbindd_getpwsid_recv },
 
        { 0, NULL, NULL, NULL }
 };

diff --git a/source3/winbindd/winbindd_getpwsid.c b/source3/winbindd/winbindd_getpwsid.c
new file mode 100644 (file)
index 0000000..135cbf6
--- /dev/null
+++ b/source3/winbindd/winbindd_getpwsid.c
@@ -0,0 +1,92 @@
+/*
+   Unix SMB/CIFS implementation.
+   async implementation of WINBINDD_GETPWSID
+   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_getpwsid_state {
+       struct dom_sid sid;
+       struct winbindd_pw pw;
+};
+
+static void winbindd_getpwsid_done(struct tevent_req *subreq);
+
+struct tevent_req *winbindd_getpwsid_send(TALLOC_CTX *mem_ctx,
+                                         struct tevent_context *ev,
+                                         struct winbindd_request *request)
+{
+       struct tevent_req *req, *subreq;
+       struct winbindd_getpwsid_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct winbindd_getpwsid_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       /* Ensure null termination */
+       request->data.sid[sizeof(request->data.sid)-1]='\0';
+
+       DEBUG(3, ("getpwsid %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_getpwsid_send(state, ev, &state->sid, &state->pw);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, winbindd_getpwsid_done, req);
+       return req;
+}
+
+static void winbindd_getpwsid_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       NTSTATUS status;
+
+       status = wb_getpwsid_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
+       }
+       tevent_req_done(req);
+}
+
+NTSTATUS winbindd_getpwsid_recv(struct tevent_req *req,
+                               struct winbindd_response *response)
+{
+       struct winbindd_getpwsid_state *state = tevent_req_data(
+               req, struct winbindd_getpwsid_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.pw = state->pw;
+       return NT_STATUS_OK;
+}

diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index ef977bb3b0a80211a33a4c551d6a654b80feecef..6dcfdcfbbda8c217f912a06125bdfc3caaa27474 100644 (file)
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -705,4 +705,10 @@ struct tevent_req *wb_getpwsid_send(TALLOC_CTX *mem_ctx,
                                    struct winbindd_pw *pw);
 NTSTATUS wb_getpwsid_recv(struct tevent_req *req);
 
+struct tevent_req *winbindd_getpwsid_send(TALLOC_CTX *mem_ctx,
+                                         struct tevent_context *ev,
+                                         struct winbindd_request *request);
+NTSTATUS winbindd_getpwsid_recv(struct tevent_req *req,
+                               struct winbindd_response *response);
+
 #endif /*  _WINBINDD_PROTO_H_  */

diff --git a/source3/winbindd/winbindd_user.c b/source3/winbindd/winbindd_user.c
index 884a3961426c5e9dc467e5ab46e08522fcb33da4..b1591475ac14607dacdad8a4575f547061576683 100644 (file)
--- a/source3/winbindd/winbindd_user.c
+++ b/source3/winbindd/winbindd_user.c
@@ -555,26 +555,6 @@ void winbindd_getpwuid(struct winbindd_cli_state *state)
        winbindd_uid2sid_async(state->mem_ctx, uid, getpwuid_recv, state);
 }
 
-/* Return a password structure given a sid */
-void winbindd_getpwsid(struct winbindd_cli_state *state)
-{
-       DOM_SID sid;
-
-       /* Ensure null termination */
-       state->request->data.sid[sizeof(state->request->data.sid)-1]='\0';
-
-       DEBUG(3, ("[%5lu]: getpwsid %s\n", (unsigned long)state->pid,
-                 state->request->data.sid));
-
-       if (!string_to_sid(&sid, state->request->data.sid)) {
-               DEBUG(5, ("%s not a SID\n", state->request->data.sid));
-               request_error(state);
-               return;
-       }
-
-       getpwsid_queryuser(state, &sid);
-}
-
 /*
  * set/get/endpwent functions
  */