sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

winbind: Remove unused WINBINDD_SID_TO_UID

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2016-02-09 08:02:22 +01:00 committed by Ralph Boehme
parent 122b1a3650
commit 112998fffa
4 changed files with 1 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nsswitch/winbind_struct_protocol.h
View File

@ -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,

2
source3/winbindd/winbindd.c
View File

@ -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",

109
source3/winbindd/winbindd_sid_to_uid.c
View File

@ -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;
}

1
source3/wscript_build
View File

@ -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