s3:winbind: Convert WINBINDD_SID_TO_UID to the new API

5 files changed, 102 insertions, 110 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 703f54e1f2..5a6cb43ef1 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1157,6 +1157,7 @@ WINBINDD_OBJ1 = \
 		winbindd/wb_sid2uid.o \
 		winbindd/winbindd_lookupsid.o \
 		winbindd/winbindd_lookupname.o \
+		winbindd/winbindd_sid_to_uid.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 a5374a99f4..1d91a608c4 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -473,7 +473,6 @@ static struct winbindd_dispatch_table {
 
 	/* Lookup related functions */
 
-	{ WINBINDD_SID_TO_UID, winbindd_sid_to_uid, "SID_TO_UID" },
 	{ 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" },
@@ -527,6 +526,8 @@ static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
 	  winbindd_lookupsid_send, winbindd_lookupsid_recv },
 	{ WINBINDD_LOOKUPNAME, "LOOKUPNAME",
 	  winbindd_lookupname_send, winbindd_lookupname_recv },
+	{ WINBINDD_SID_TO_UID, "SID_TO_UID",
+	  winbindd_sid_to_uid_send, winbindd_sid_to_uid_recv },
 
 	{ 0, NULL, NULL, NULL }
 };
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 2a07ae2d4d..e326f49559 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -642,6 +642,11 @@ struct tevent_req *wb_sid2uid_send(TALLOC_CTX *mem_ctx,
 				   const struct dom_sid *sid);
 NTSTATUS wb_sid2uid_recv(struct tevent_req *req, uid_t *uid);
 
+struct tevent_req *winbindd_sid_to_uid_send(TALLOC_CTX *mem_ctx,
+					    struct tevent_context *ev,
+					    struct winbindd_request *request);
+NTSTATUS winbindd_sid_to_uid_recv(struct tevent_req *req,
+				  struct winbindd_response *response);
 
 
 #endif /*  _WINBINDD_PROTO_H_  */
diff --git a/source3/winbindd/winbindd_sid.c b/source3/winbindd/winbindd_sid.c
index ee1ee2b6bb..ae3d369846 100644
--- a/source3/winbindd/winbindd_sid.c
+++ b/source3/winbindd/winbindd_sid.c
@@ -55,115 +55,6 @@ void winbindd_lookuprids(struct winbindd_cli_state *state)
 	sendto_domain(state, domain);
 }
 
-/* Convert a sid to a uid.  We assume we only have one rid attached to the
-   sid. */
-
-static void sid2uid_recv(void *private_data, bool success, uid_t uid)
-{
-	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.uid = uid;
-	request_ok(state);
-}
-
-static void sid2uid_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, ("sid2uid_lookupsid_recv: Could not get convert sid "
-			  "%s from string\n", state->request->data.sid));
-		request_error(state);
-		return;
-	}
-
-	if (!success) {
-		DEBUG(5, ("sid2uid_lookupsid_recv Could not convert get sid type for %s\n",
-			  state->request->data.sid));
-		goto fail;
-	}
-
-	if ( (type!=SID_NAME_USER) && (type!=SID_NAME_COMPUTER) ) {
-		DEBUG(5,("sid2uid_lookupsid_recv: Sid %s is not a user or a computer.\n", 
-			 state->request->data.sid));
-		goto fail;
-	}
-
-	/* always use the async interface (may block) */
-	winbindd_sid2uid_async(state->mem_ctx, &sid, sid2uid_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_sid2uid(&sid, -1);
-	request_error(state);
-	return;
-}
-
-void winbindd_sid_to_uid(struct winbindd_cli_state *state)
-{
-	DOM_SID sid;
-	uid_t uid;
-	bool expired;
-
-	/* Ensure null termination */
-	state->request->data.sid[sizeof(state->request->data.sid)-1]='\0';
-
-	DEBUG(3, ("[%5lu]: sid to uid %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_sid2uid(&sid, &uid, &expired)) {
-		DEBUG(10, ("idmap_cache_find_sid2uid found %d%s\n",
-			   (int)uid, expired ? " (expired)": ""));
-		if (expired && IS_DOMAIN_ONLINE(find_our_domain())) {
-			DEBUG(10, ("revalidating expired entry\n"));
-			goto backend;
-		}
-		if (uid == -1) {
-			DEBUG(10, ("Returning negative cache entry\n"));
-			request_error(state);
-			return;
-		}
-		DEBUG(10, ("Returning positive cache entry\n"));
-		state->response->data.uid = uid;
-		request_ok(state);
-		return;
-	}
-
-	/* Validate the SID as a user.  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, sid2uid_lookupsid_recv, state );
-}
-
 /* Convert a sid to a gid.  We assume we only have one rid attached to the
    sid.*/
 
diff --git a/source3/winbindd/winbindd_sid_to_uid.c b/source3/winbindd/winbindd_sid_to_uid.c
new file mode 100644
index 0000000000..a6ff6cbaf4
--- /dev/null
+++ b/source3/winbindd/winbindd_sid_to_uid.c
@@ -0,0 +1,94 @@
+/*
+   Unix SMB/CIFS implementation.
+   async implementation of WINBINDD_SID_TO_UID
+   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_uid_state {
+	struct dom_sid sid;
+	uid_t uid;
+};
+
+static void winbindd_sid_to_uid_done(struct tevent_req *subreq);
+
+struct tevent_req *winbindd_sid_to_uid_send(TALLOC_CTX *mem_ctx,
+					    struct tevent_context *ev,
+					    struct winbindd_request *request)
+{
+	struct tevent_req *req, *subreq;
+	struct winbindd_sid_to_uid_state *state;
+
+	req = tevent_req_create(mem_ctx, &state,
+				struct winbindd_sid_to_uid_state);
+	if (req == NULL) {
+		return NULL;
+	}
+
+	/* Ensure null termination */
+	request->data.sid[sizeof(request->data.sid)-1]='\0';
+
+	DEBUG(3, ("sid to uid %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_sid2uid_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_uid_done, req);
+	return req;
+}
+
+static void winbindd_sid_to_uid_done(struct tevent_req *subreq)
+{
+	struct tevent_req *req = tevent_req_callback_data(
+		subreq, struct tevent_req);
+	struct winbindd_sid_to_uid_state *state = tevent_req_data(
+		req, struct winbindd_sid_to_uid_state);
+	NTSTATUS status;
+
+	status = wb_sid2uid_recv(subreq, &state->uid);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		tevent_req_nterror(req, status);
+		return;
+	}
+	tevent_req_done(req);
+}
+
+NTSTATUS winbindd_sid_to_uid_recv(struct tevent_req *req,
+				  struct winbindd_response *response)
+{
+	struct winbindd_sid_to_uid_state *state = tevent_req_data(
+		req, struct winbindd_sid_to_uid_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.uid = state->uid;
+	return NT_STATUS_OK;
+}