winbind: Remove unused WINBINDD_SID_TO_UID

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

4 files changed, 1 insertions, 113 deletions

diff --git a/nsswitch/winbind_struct_protocol.h b/nsswitch/winbind_struct_protocol.h
index 178906d582b..004e2ede1c8 100644
--- a/nsswitch/winbind_struct_protocol.h
+++ b/nsswitch/winbind_struct_protocol.h
@@ -54,6 +54,7 @@ typedef char fstring[FSTRING_LEN];
  * 26: added WINBINDD_DC_INFO
  * 27: added WINBINDD_LOOKUPSIDS
  * 28: added WINBINDD_XIDS_TO_SIDS
+ *     removed WINBINDD_SID_TO_UID
  */
 #define WINBIND_INTERFACE_VERSION 28
 
@@ -111,7 +112,6 @@ enum winbindd_cmd {
 
 	/* Lookup functions */
 
-	WINBINDD_SID_TO_UID,
 	WINBINDD_SID_TO_GID,
 	WINBINDD_SIDS_TO_XIDS,
 	WINBINDD_XIDS_TO_SIDS,
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index ec49ea508a8..e54c6f7e146 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -608,8 +608,6 @@ static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
 	  winbindd_lookupsids_send, winbindd_lookupsids_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 },
 	{ WINBINDD_SID_TO_GID, "SID_TO_GID",
 	  winbindd_sid_to_gid_send, winbindd_sid_to_gid_recv },
 	{ WINBINDD_UID_TO_SID, "UID_TO_SID",
diff --git a/source3/winbindd/winbindd_sid_to_uid.c b/source3/winbindd/winbindd_sid_to_uid.c
deleted file mode 100644
index cbab2d2c162..00000000000
--- a/source3/winbindd/winbindd_sid_to_uid.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-   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"
-#include "../libcli/security/security.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_cli_state *cli,
-					    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_sids2xids_send(state, ev, &state->sid, 1);
-	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;
-	struct unixid xids[1];
-
-	status = wb_sids2xids_recv(subreq, xids, ARRAY_SIZE(xids));
-	TALLOC_FREE(subreq);
-	if (tevent_req_nterror(req, status)) {
-		return;
-	}
-
-	/*
-	 * We are filtering further down in sids2xids, but that filtering
-	 * depends on the actual type of the sid handed in (as determined
-	 * by lookupsids). Here we need to filter for the type of object
-	 * actually requested, in this case uid.
-	 */
-	if (!(xids[0].type == ID_TYPE_UID || xids[0].type == ID_TYPE_BOTH)) {
-		tevent_req_nterror(req, NT_STATUS_NONE_MAPPED);
-		return;
-	}
-
-	state->uid = (uid_t)xids[0].id;
-	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;
-}
diff --git a/source3/wscript_build b/source3/wscript_build
index d5dbd4e7cb8..b8072bad53a 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -944,7 +944,6 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  winbindd/winbindd_lookupsid.c
                  winbindd/winbindd_lookupsids.c
                  winbindd/winbindd_lookupname.c
-                 winbindd/winbindd_sid_to_uid.c
                  winbindd/winbindd_sid_to_gid.c
                  winbindd/winbindd_uid_to_sid.c
                  winbindd/winbindd_gid_to_sid.c