sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s3:winbind: Convert WINBINDD_LOOKUPSID to the new API

Browse Source
This commit is contained in:
Volker Lendecke 2009-08-04 06:57:13 -04:00
parent bb359c780a
commit fa59f9720d
5 changed files with 111 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/Makefile.in
View File

@ -1153,6 +1153,7 @@ WINBINDD_OBJ1 = \
winbindd/winbindd_ndr.o \
winbindd/wb_ping.o \
winbindd/wb_lookupsid.o \
winbindd/winbindd_lookupsid.o \
auth/token_util.o \
../nsswitch/libwbclient/wb_reqtrans.o \
smbd/connection.o

3
source3/winbindd/winbindd.c
View File

@ -469,7 +469,6 @@ static struct winbindd_dispatch_table {
/* SID related functions */
{ WINBINDD_LOOKUPSID, winbindd_lookupsid, "LOOKUPSID" },
{ WINBINDD_LOOKUPNAME, winbindd_lookupname, "LOOKUPNAME" },
{ WINBINDD_LOOKUPRIDS, winbindd_lookuprids, "LOOKUPRIDS" },
@ -526,6 +525,8 @@ struct winbindd_async_dispatch_table {
static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
{ WINBINDD_PING, "PING",
wb_ping_send, wb_ping_recv },
{ WINBINDD_LOOKUPSID, "LOOKUPSID",
winbindd_lookupsid_send, winbindd_lookupsid_recv },
{ 0, NULL, NULL, NULL }
};

101
source3/winbindd/winbindd_lookupsid.c Normal file
View File

@ -0,0 +1,101 @@
/*
Unix SMB/CIFS implementation.
async implementation of WINBINDD_GETPWNAM
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_lookupsid_state {
struct tevent_context *ev;
struct dom_sid sid;
enum lsa_SidType type;
const char *domname;
const char *name;
};
static void winbindd_lookupsid_done(struct tevent_req *subreq);
struct tevent_req *winbindd_lookupsid_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct winbindd_request *request)
{
struct tevent_req *req, *subreq;
struct winbindd_lookupsid_state *state;
req = tevent_req_create(mem_ctx, &state,
struct winbindd_lookupsid_state);
if (req == NULL) {
return NULL;
}
state->ev = ev;
/* Ensure null termination */
request->data.sid[sizeof(request->data.sid)-1]='\0';
DEBUG(3, ("lookupsid %s\n", request->data.sid));
if (!string_to_sid(&state->sid, request->data.sid)) {
DEBUG(5, ("%s not a SID\n", request->data.sid));
tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
return tevent_req_post(req, ev);;
}
subreq = wb_lookupsid_send(state, ev, &state->sid);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
tevent_req_set_callback(subreq, winbindd_lookupsid_done, req);
return req;
}
static void winbindd_lookupsid_done(struct tevent_req *subreq)
{
struct tevent_req *req = tevent_req_callback_data(
subreq, struct tevent_req);
struct winbindd_lookupsid_state *state = tevent_req_data(
req, struct winbindd_lookupsid_state);
NTSTATUS status;
status = wb_lookupsid_recv(subreq, state, &state->type,
&state->domname, &state->name);
TALLOC_FREE(subreq);
if (!NT_STATUS_IS_OK(status)) {
tevent_req_nterror(req, status);
return;
}
tevent_req_done(req);
}
NTSTATUS winbindd_lookupsid_recv(struct tevent_req *req,
struct winbindd_response *response)
{
struct winbindd_lookupsid_state *state = tevent_req_data(
req, struct winbindd_lookupsid_state);
NTSTATUS status;
if (tevent_req_is_nterror(req, &status)) {
DEBUG(5, ("Could not lookup sid %s: %s\n",
sid_string_dbg(&state->sid), nt_errstr(status)));
return status;
}
fstrcpy(response->data.name.dom_name, state->domname);
fstrcpy(response->data.name.name, state->name);
response->data.name.type = state->type;
return NT_STATUS_OK;
}

7
source3/winbindd/winbindd_proto.h
View File

@ -613,4 +613,11 @@ NTSTATUS wb_lookupsid_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
enum lsa_SidType *type, const char **domain,
const char **name);
struct tevent_req *winbindd_lookupsid_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct winbindd_request *request);
NTSTATUS winbindd_lookupsid_recv(struct tevent_req *req,
struct winbindd_response *response);
#endif /* _WINBINDD_PROTO_H_ */

42
source3/winbindd/winbindd_sid.c
View File

@ -27,48 +27,6 @@
/* Convert a string */
static void lookupsid_recv(void *private_data, bool success,
const char *dom_name, const char *name,
enum lsa_SidType type);
void winbindd_lookupsid(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]: lookupsid %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;
}
winbindd_lookupsid_async(state->mem_ctx, &sid, lookupsid_recv, state);
}
static void lookupsid_recv(void *private_data, bool success,
const char *dom_name, const char *name,
enum lsa_SidType type)
{
struct winbindd_cli_state *state =
talloc_get_type_abort(private_data, struct winbindd_cli_state);
if (!success) {
DEBUG(5, ("lookupsid returned an error\n"));
request_error(state);
return;
}
fstrcpy(state->response->data.name.dom_name, dom_name);
fstrcpy(state->response->data.name.name, name);
state->response->data.name.type = type;
request_ok(state);
}
/**
* Look up the SID for a qualified name.
**/