sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s3:winbind: Convert WINBINDD_SET_MAPPING to the new API

Browse Source
This commit is contained in:
Volker Lendecke 2009-09-06 14:47:06 +02:00
parent d9b7fd59b0
commit 7159060450
15 changed files with 538 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/Makefile.in
View File

@ -1214,6 +1214,7 @@ WINBINDD_OBJ1 = \
winbindd/winbindd_list_users.o \
winbindd/winbindd_list_groups.o \
winbindd/winbindd_check_machine_acct.o \
winbindd/winbindd_set_mapping.o \
auth/token_util.o \
../nsswitch/libwbclient/wb_reqtrans.o \
smbd/connection.o

158
source3/librpc/gen_ndr/cli_wbint.c
View File

@ -3075,3 +3075,161 @@ NTSTATUS rpccli_wbint_CheckMachineAccount(struct rpc_pipe_client *cli,
return r.out.result;
}
struct rpccli_wbint_SetMapping_state {
struct wbint_SetMapping orig;
struct wbint_SetMapping tmp;
TALLOC_CTX *out_mem_ctx;
NTSTATUS (*dispatch_recv)(struct tevent_req *req, TALLOC_CTX *mem_ctx);
};
static void rpccli_wbint_SetMapping_done(struct tevent_req *subreq);
struct tevent_req *rpccli_wbint_SetMapping_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct rpc_pipe_client *cli,
struct dom_sid *_sid /* [in] [ref] */,
enum wbint_IdType _type /* [in] */,
uint64_t _id /* [in] */)
{
struct tevent_req *req;
struct rpccli_wbint_SetMapping_state *state;
struct tevent_req *subreq;
req = tevent_req_create(mem_ctx, &state,
struct rpccli_wbint_SetMapping_state);
if (req == NULL) {
return NULL;
}
state->out_mem_ctx = NULL;
state->dispatch_recv = cli->dispatch_recv;
/* In parameters */
state->orig.in.sid = _sid;
state->orig.in.type = _type;
state->orig.in.id = _id;
/* Out parameters */
/* Result */
ZERO_STRUCT(state->orig.out.result);
if (DEBUGLEVEL >= 10) {
NDR_PRINT_IN_DEBUG(wbint_SetMapping, &state->orig);
}
/* make a temporary copy, that we pass to the dispatch function */
state->tmp = state->orig;
subreq = cli->dispatch_send(state, ev, cli,
&ndr_table_wbint,
NDR_WBINT_SETMAPPING,
&state->tmp);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
tevent_req_set_callback(subreq, rpccli_wbint_SetMapping_done, req);
return req;
}
static void rpccli_wbint_SetMapping_done(struct tevent_req *subreq)
{
struct tevent_req *req = tevent_req_callback_data(
subreq, struct tevent_req);
struct rpccli_wbint_SetMapping_state *state = tevent_req_data(
req, struct rpccli_wbint_SetMapping_state);
NTSTATUS status;
TALLOC_CTX *mem_ctx;
if (state->out_mem_ctx) {
mem_ctx = state->out_mem_ctx;
} else {
mem_ctx = state;
}
status = state->dispatch_recv(subreq, mem_ctx);
TALLOC_FREE(subreq);
if (!NT_STATUS_IS_OK(status)) {
tevent_req_nterror(req, status);
return;
}
/* Copy out parameters */
/* Copy result */
state->orig.out.result = state->tmp.out.result;
/* Reset temporary structure */
ZERO_STRUCT(state->tmp);
if (DEBUGLEVEL >= 10) {
NDR_PRINT_OUT_DEBUG(wbint_SetMapping, &state->orig);
}
tevent_req_done(req);
}
NTSTATUS rpccli_wbint_SetMapping_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
NTSTATUS *result)
{
struct rpccli_wbint_SetMapping_state *state = tevent_req_data(
req, struct rpccli_wbint_SetMapping_state);
NTSTATUS status;
if (tevent_req_is_nterror(req, &status)) {
tevent_req_received(req);
return status;
}
/* Steal possbile out parameters to the callers context */
talloc_steal(mem_ctx, state->out_mem_ctx);
/* Return result */
*result = state->orig.out.result;
tevent_req_received(req);
return NT_STATUS_OK;
}
NTSTATUS rpccli_wbint_SetMapping(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct dom_sid *sid /* [in] [ref] */,
enum wbint_IdType type /* [in] */,
uint64_t id /* [in] */)
{
struct wbint_SetMapping r;
NTSTATUS status;
/* In parameters */
r.in.sid = sid;
r.in.type = type;
r.in.id = id;
if (DEBUGLEVEL >= 10) {
NDR_PRINT_IN_DEBUG(wbint_SetMapping, &r);
}
status = cli->dispatch(cli,
mem_ctx,
&ndr_table_wbint,
NDR_WBINT_SETMAPPING,
&r);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
if (DEBUGLEVEL >= 10) {
NDR_PRINT_OUT_DEBUG(wbint_SetMapping, &r);
}
if (NT_STATUS_IS_ERR(status)) {
return status;
}
/* Return variables */
/* Return result */
return r.out.result;
}

14
source3/librpc/gen_ndr/cli_wbint.h
View File

@ -240,4 +240,18 @@ NTSTATUS rpccli_wbint_CheckMachineAccount_recv(struct tevent_req *req,
NTSTATUS *result);
NTSTATUS rpccli_wbint_CheckMachineAccount(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx);
struct tevent_req *rpccli_wbint_SetMapping_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct rpc_pipe_client *cli,
struct dom_sid *_sid /* [in] [ref] */,
enum wbint_IdType _type /* [in] */,
uint64_t _id /* [in] */);
NTSTATUS rpccli_wbint_SetMapping_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
NTSTATUS *result);
NTSTATUS rpccli_wbint_SetMapping(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct dom_sid *sid /* [in] [ref] */,
enum wbint_IdType type /* [in] */,
uint64_t id /* [in] */);
#endif /* __CLI_WBINT__ */

99
source3/librpc/gen_ndr/ndr_wbint.c
View File

@ -492,6 +492,32 @@ _PUBLIC_ void ndr_print_wbint_userinfos(struct ndr_print *ndr, const char *name,
ndr->depth--;
}
_PUBLIC_ enum ndr_err_code ndr_push_wbint_IdType(struct ndr_push *ndr, int ndr_flags, enum wbint_IdType r)
{
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r));
return NDR_ERR_SUCCESS;
}
_PUBLIC_ enum ndr_err_code ndr_pull_wbint_IdType(struct ndr_pull *ndr, int ndr_flags, enum wbint_IdType *r)
{
uint16_t v;
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &v));
*r = v;
return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_wbint_IdType(struct ndr_print *ndr, const char *name, enum wbint_IdType r)
{
const char *val = NULL;
switch (r) {
case WBINT_ID_TYPE_NOT_SPECIFIED: val = "WBINT_ID_TYPE_NOT_SPECIFIED"; break;
case WBINT_ID_TYPE_UID: val = "WBINT_ID_TYPE_UID"; break;
case WBINT_ID_TYPE_GID: val = "WBINT_ID_TYPE_GID"; break;
}
ndr_print_enum(ndr, name, "ENUM", val, r);
}
static enum ndr_err_code ndr_push_wbint_Ping(struct ndr_push *ndr, int flags, const struct wbint_Ping *r)
{
if (flags & NDR_IN) {
@ -2152,6 +2178,69 @@ _PUBLIC_ void ndr_print_wbint_CheckMachineAccount(struct ndr_print *ndr, const c
ndr->depth--;
}
static enum ndr_err_code ndr_push_wbint_SetMapping(struct ndr_push *ndr, int flags, const struct wbint_SetMapping *r)
{
if (flags & NDR_IN) {
if (r->in.sid == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
}
NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->in.sid));
NDR_CHECK(ndr_push_wbint_IdType(ndr, NDR_SCALARS, r->in.type));
NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, r->in.id));
}
if (flags & NDR_OUT) {
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
}
return NDR_ERR_SUCCESS;
}
static enum ndr_err_code ndr_pull_wbint_SetMapping(struct ndr_pull *ndr, int flags, struct wbint_SetMapping *r)
{
TALLOC_CTX *_mem_save_sid_0;
if (flags & NDR_IN) {
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
NDR_PULL_ALLOC(ndr, r->in.sid);
}
_mem_save_sid_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->in.sid, LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS, r->in.sid));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sid_0, LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_wbint_IdType(ndr, NDR_SCALARS, &r->in.type));
NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->in.id));
}
if (flags & NDR_OUT) {
NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
}
return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_wbint_SetMapping(struct ndr_print *ndr, const char *name, int flags, const struct wbint_SetMapping *r)
{
ndr_print_struct(ndr, name, "wbint_SetMapping");
ndr->depth++;
if (flags & NDR_SET_VALUES) {
ndr->flags |= LIBNDR_PRINT_SET_VALUES;
}
if (flags & NDR_IN) {
ndr_print_struct(ndr, "in", "wbint_SetMapping");
ndr->depth++;
ndr_print_ptr(ndr, "sid", r->in.sid);
ndr->depth++;
ndr_print_dom_sid(ndr, "sid", r->in.sid);
ndr->depth--;
ndr_print_wbint_IdType(ndr, "type", r->in.type);
ndr_print_hyper(ndr, "id", r->in.id);
ndr->depth--;
}
if (flags & NDR_OUT) {
ndr_print_struct(ndr, "out", "wbint_SetMapping");
ndr->depth++;
ndr_print_NTSTATUS(ndr, "result", r->out.result);
ndr->depth--;
}
ndr->depth--;
}
static const struct ndr_interface_call wbint_calls[] = {
{
"wbint_Ping",
@ -2305,6 +2394,14 @@ static const struct ndr_interface_call wbint_calls[] = {
(ndr_print_function_t) ndr_print_wbint_CheckMachineAccount,
false,
},
{
"wbint_SetMapping",
sizeof(struct wbint_SetMapping),
(ndr_push_flags_fn_t) ndr_push_wbint_SetMapping,
(ndr_pull_flags_fn_t) ndr_pull_wbint_SetMapping,
(ndr_print_function_t) ndr_print_wbint_SetMapping,
false,
},
{ NULL, 0, NULL, NULL, NULL, false }
};
@ -2334,7 +2431,7 @@ const struct ndr_interface_table ndr_table_wbint = {
NDR_WBINT_VERSION
},
.helpstring = NDR_WBINT_HELPSTRING,
.num_calls = 19,
.num_calls = 20,
.calls = wbint_calls,
.endpoints = &wbint_endpoints,
.authservices = &wbint_authservices

8
source3/librpc/gen_ndr/ndr_wbint.h
View File

@ -49,7 +49,9 @@ extern const struct ndr_interface_table ndr_table_wbint;
#define NDR_WBINT_CHECKMACHINEACCOUNT (0x12)
#define NDR_WBINT_CALL_COUNT (19)
#define NDR_WBINT_SETMAPPING (0x13)
#define NDR_WBINT_CALL_COUNT (20)
enum ndr_err_code ndr_push_wbint_userinfo(struct ndr_push *ndr, int ndr_flags, const struct wbint_userinfo *r);
enum ndr_err_code ndr_pull_wbint_userinfo(struct ndr_pull *ndr, int ndr_flags, struct wbint_userinfo *r);
void ndr_print_wbint_userinfo(struct ndr_print *ndr, const char *name, const struct wbint_userinfo *r);
@ -68,6 +70,9 @@ void ndr_print_wbint_Principals(struct ndr_print *ndr, const char *name, const s
enum ndr_err_code ndr_push_wbint_userinfos(struct ndr_push *ndr, int ndr_flags, const struct wbint_userinfos *r);
enum ndr_err_code ndr_pull_wbint_userinfos(struct ndr_pull *ndr, int ndr_flags, struct wbint_userinfos *r);
void ndr_print_wbint_userinfos(struct ndr_print *ndr, const char *name, const struct wbint_userinfos *r);
enum ndr_err_code ndr_push_wbint_IdType(struct ndr_push *ndr, int ndr_flags, enum wbint_IdType r);
enum ndr_err_code ndr_pull_wbint_IdType(struct ndr_pull *ndr, int ndr_flags, enum wbint_IdType *r);
void ndr_print_wbint_IdType(struct ndr_print *ndr, const char *name, enum wbint_IdType r);
void ndr_print_wbint_Ping(struct ndr_print *ndr, const char *name, int flags, const struct wbint_Ping *r);
void ndr_print_wbint_LookupSid(struct ndr_print *ndr, const char *name, int flags, const struct wbint_LookupSid *r);
void ndr_print_wbint_LookupName(struct ndr_print *ndr, const char *name, int flags, const struct wbint_LookupName *r);
@ -87,4 +92,5 @@ void ndr_print_wbint_QueryGroupList(struct ndr_print *ndr, const char *name, int
void ndr_print_wbint_DsGetDcName(struct ndr_print *ndr, const char *name, int flags, const struct wbint_DsGetDcName *r);
void ndr_print_wbint_LookupRids(struct ndr_print *ndr, const char *name, int flags, const struct wbint_LookupRids *r);
void ndr_print_wbint_CheckMachineAccount(struct ndr_print *ndr, const char *name, int flags, const struct wbint_CheckMachineAccount *r);
void ndr_print_wbint_SetMapping(struct ndr_print *ndr, const char *name, int flags, const struct wbint_SetMapping *r);
#endif /* _HEADER_NDR_wbint */

80
source3/librpc/gen_ndr/srv_wbint.c
View File

@ -1537,6 +1537,79 @@ static bool api_wbint_CheckMachineAccount(pipes_struct *p)
return true;
}
static bool api_wbint_SetMapping(pipes_struct *p)
{
const struct ndr_interface_call *call;
struct ndr_pull *pull;
struct ndr_push *push;
enum ndr_err_code ndr_err;
DATA_BLOB blob;
struct wbint_SetMapping *r;
call = &ndr_table_wbint.calls[NDR_WBINT_SETMAPPING];
r = talloc(talloc_tos(), struct wbint_SetMapping);
if (r == NULL) {
return false;
}
if (!prs_data_blob(&p->in_data.data, &blob, r)) {
talloc_free(r);
return false;
}
pull = ndr_pull_init_blob(&blob, r, NULL);
if (pull == NULL) {
talloc_free(r);
return false;
}
pull->flags |= LIBNDR_FLAG_REF_ALLOC;
ndr_err = call->ndr_pull(pull, NDR_IN, r);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
talloc_free(r);
return false;
}
if (DEBUGLEVEL >= 10) {
NDR_PRINT_IN_DEBUG(wbint_SetMapping, r);
}
r->out.result = _wbint_SetMapping(p, r);
if (p->rng_fault_state) {
talloc_free(r);
/* Return true here, srv_pipe_hnd.c will take care */
return true;
}
if (DEBUGLEVEL >= 10) {
NDR_PRINT_OUT_DEBUG(wbint_SetMapping, r);
}
push = ndr_push_init_ctx(r, NULL);
if (push == NULL) {
talloc_free(r);
return false;
}
ndr_err = call->ndr_push(push, NDR_OUT, r);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
talloc_free(r);
return false;
}
blob = ndr_push_blob(push);
if (!prs_copy_data_in(&p->out_data.rdata, (const char *)blob.data, (uint32_t)blob.length)) {
talloc_free(r);
return false;
}
talloc_free(r);
return true;
}
/* Tables */
static struct api_struct api_wbint_cmds[] =
@ -1560,6 +1633,7 @@ static struct api_struct api_wbint_cmds[] =
{"WBINT_DSGETDCNAME", NDR_WBINT_DSGETDCNAME, api_wbint_DsGetDcName},
{"WBINT_LOOKUPRIDS", NDR_WBINT_LOOKUPRIDS, api_wbint_LookupRids},
{"WBINT_CHECKMACHINEACCOUNT", NDR_WBINT_CHECKMACHINEACCOUNT, api_wbint_CheckMachineAccount},
{"WBINT_SETMAPPING", NDR_WBINT_SETMAPPING, api_wbint_SetMapping},
};
void wbint_get_pipe_fns(struct api_struct **fns, int *n_fns)
@ -1813,6 +1887,12 @@ NTSTATUS rpc_wbint_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, co
return NT_STATUS_OK;
}
case NDR_WBINT_SETMAPPING: {
struct wbint_SetMapping *r = (struct wbint_SetMapping *)_r;
r->out.result = _wbint_SetMapping(cli->pipes_struct, r);
return NT_STATUS_OK;
}
default:
return NT_STATUS_NOT_IMPLEMENTED;
}

2
source3/librpc/gen_ndr/srv_wbint.h
View File

@ -20,6 +20,7 @@ NTSTATUS _wbint_QueryGroupList(pipes_struct *p, struct wbint_QueryGroupList *r);
NTSTATUS _wbint_DsGetDcName(pipes_struct *p, struct wbint_DsGetDcName *r);
NTSTATUS _wbint_LookupRids(pipes_struct *p, struct wbint_LookupRids *r);
NTSTATUS _wbint_CheckMachineAccount(pipes_struct *p, struct wbint_CheckMachineAccount *r);
NTSTATUS _wbint_SetMapping(pipes_struct *p, struct wbint_SetMapping *r);
void wbint_get_pipe_fns(struct api_struct **fns, int *n_fns);
NTSTATUS rpc_wbint_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
void _wbint_Ping(pipes_struct *p, struct wbint_Ping *r);
@ -41,5 +42,6 @@ NTSTATUS _wbint_QueryGroupList(pipes_struct *p, struct wbint_QueryGroupList *r);
NTSTATUS _wbint_DsGetDcName(pipes_struct *p, struct wbint_DsGetDcName *r);
NTSTATUS _wbint_LookupRids(pipes_struct *p, struct wbint_LookupRids *r);
NTSTATUS _wbint_CheckMachineAccount(pipes_struct *p, struct wbint_CheckMachineAccount *r);
NTSTATUS _wbint_SetMapping(pipes_struct *p, struct wbint_SetMapping *r);
NTSTATUS rpc_wbint_init(void);
#endif /* __SRV_WBINT__ */

29
source3/librpc/gen_ndr/wbint.h
View File

@ -44,6 +44,21 @@ struct wbint_userinfos {
struct wbint_userinfo *userinfos;/* [size_is(num_userinfos)] */
}/* [public] */;
enum wbint_IdType
#ifndef USE_UINT_ENUMS
{
WBINT_ID_TYPE_NOT_SPECIFIED,
WBINT_ID_TYPE_UID,
WBINT_ID_TYPE_GID
}
#else
{ __donnot_use_enum_wbint_IdType=0x7FFFFFFF}
#define WBINT_ID_TYPE_NOT_SPECIFIED ( 0 )
#define WBINT_ID_TYPE_UID ( 1 )
#define WBINT_ID_TYPE_GID ( 2 )
#endif
;
struct wbint_Ping {
struct {
@ -278,4 +293,18 @@ struct wbint_CheckMachineAccount {
};
struct wbint_SetMapping {
struct {
struct dom_sid *sid;/* [ref] */
enum wbint_IdType type;
uint64_t id;
} in;
struct {
NTSTATUS result;
} out;
};
#endif /* _HEADER_wbint */

12
source3/librpc/idl/wbint.idl
View File

@ -146,4 +146,16 @@ interface wbint
NTSTATUS wbint_CheckMachineAccount(
);
typedef [public] enum {
WBINT_ID_TYPE_NOT_SPECIFIED,
WBINT_ID_TYPE_UID,
WBINT_ID_TYPE_GID
} wbint_IdType;
NTSTATUS wbint_SetMapping(
[in] dom_sid *sid,
[in] wbint_IdType type,
[in] hyper id
);
}

3
source3/winbindd/winbindd.c
View File

@ -440,7 +440,6 @@ static struct winbindd_dispatch_table {
/* Lookup related functions */
{ WINBINDD_SET_MAPPING, winbindd_set_mapping, "SET_MAPPING" },
{ WINBINDD_REMOVE_MAPPING, winbindd_remove_mapping, "REMOVE_MAPPING" },
{ WINBINDD_SET_HWM, winbindd_set_hwm, "SET_HWMS" },
@ -547,6 +546,8 @@ static struct winbindd_async_dispatch_table async_priv_table[] = {
winbindd_allocate_uid_send, winbindd_allocate_uid_recv },
{ WINBINDD_ALLOCATE_GID, "ALLOCATE_GID",
winbindd_allocate_gid_send, winbindd_allocate_gid_recv },
{ WINBINDD_SET_MAPPING, "SET_MAPPING",
winbindd_set_mapping_send, winbindd_set_mapping_recv },
{ 0, NULL, NULL, NULL }
};

22
source3/winbindd/winbindd_dual_srv.c
View File

@ -447,3 +447,25 @@ again:
return status;
}
NTSTATUS _wbint_SetMapping(pipes_struct *p, struct wbint_SetMapping *r)
{
struct id_map map;
map.sid = r->in.sid;
map.xid.id = r->in.id;
map.status = ID_MAPPED;
switch (r->in.type) {
case WBINT_ID_TYPE_UID:
map.xid.type = ID_TYPE_UID;
break;
case WBINT_ID_TYPE_GID:
map.xid.type = ID_TYPE_GID;
break;
default:
return NT_STATUS_INVALID_PARAMETER;
}
return idmap_set_mapping(&map);
}

61
source3/winbindd/winbindd_idmap.c
View File

@ -45,63 +45,6 @@ struct winbindd_child *idmap_child(void)
return &static_idmap_child;
}
static void winbindd_set_mapping_recv(TALLOC_CTX *mem_ctx, bool success,
struct winbindd_response *response,
void *c, void *private_data)
{
void (*cont)(void *priv, bool succ) = (void (*)(void *, bool))c;
if (!success) {
DEBUG(5, ("Could not trigger idmap_set_mapping\n"));
cont(private_data, False);
return;
}
if (response->result != WINBINDD_OK) {
DEBUG(5, ("idmap_set_mapping returned an error\n"));
cont(private_data, False);
return;
}
cont(private_data, True);
}
void winbindd_set_mapping_async(TALLOC_CTX *mem_ctx, const struct id_map *map,
void (*cont)(void *private_data, bool success),
void *private_data)
{
struct winbindd_request request;
ZERO_STRUCT(request);
request.cmd = WINBINDD_DUAL_SET_MAPPING;
request.data.dual_idmapset.id = map->xid.id;
request.data.dual_idmapset.type = map->xid.type;
sid_to_fstring(request.data.dual_idmapset.sid, map->sid);
do_async(mem_ctx, idmap_child(), &request, winbindd_set_mapping_recv,
(void *)cont, private_data);
}
enum winbindd_result winbindd_dual_set_mapping(struct winbindd_domain *domain,
struct winbindd_cli_state *state)
{
struct id_map map;
DOM_SID sid;
NTSTATUS result;
DEBUG(3, ("[%5lu]: dual_idmapset\n", (unsigned long)state->pid));
if (!string_to_sid(&sid, state->request->data.dual_idmapset.sid))
return WINBINDD_ERROR;
map.sid = &sid;
map.xid.id = state->request->data.dual_idmapset.id;
map.xid.type = state->request->data.dual_idmapset.type;
map.status = ID_MAPPED;
result = idmap_set_mapping(&map);
return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
}
static void winbindd_remove_mapping_recv(TALLOC_CTX *mem_ctx, bool success,
struct winbindd_response *response,
void *c, void *private_data)
@ -535,10 +478,6 @@ static const struct winbindd_child_dispatch_table idmap_dispatch_table[] = {
.name = "DUAL_GID2SID",
.struct_cmd = WINBINDD_DUAL_GID2SID,
.struct_fn = winbindd_dual_gid2sid,
},{
.name = "DUAL_SET_MAPPING",
.struct_cmd = WINBINDD_DUAL_SET_MAPPING,
.struct_fn = winbindd_dual_set_mapping,
},{
.name = "DUAL_REMOVE_MAPPING",
.struct_cmd = WINBINDD_DUAL_REMOVE_MAPPING,

7
source3/winbindd/winbindd_proto.h
View File

@ -969,4 +969,11 @@ struct tevent_req *winbindd_check_machine_acct_send(TALLOC_CTX *mem_ctx,
NTSTATUS winbindd_check_machine_acct_recv(struct tevent_req *req,
struct winbindd_response *presp);
struct tevent_req *winbindd_set_mapping_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct winbindd_cli_state *cli,
struct winbindd_request *request);
NTSTATUS winbindd_set_mapping_recv(struct tevent_req *req,
struct winbindd_response *response);
#endif /* _WINBINDD_PROTO_H_ */

106
source3/winbindd/winbindd_set_mapping.c Normal file
View File

@ -0,0 +1,106 @@
/*
Unix SMB/CIFS implementation.
async implementation of WINBINDD_SET_MAPPING
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 "librpc/gen_ndr/cli_wbint.h"
struct winbindd_set_mapping_state {
struct dom_sid sid;
};
static void winbindd_set_mapping_done(struct tevent_req *subreq);
struct tevent_req *winbindd_set_mapping_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_set_mapping_state *state;
struct winbindd_child *child;
enum id_type type;
req = tevent_req_create(mem_ctx, &state,
struct winbindd_set_mapping_state);
if (req == NULL) {
return NULL;
}
/* Ensure null termination */
request->data.dual_idmapset.sid[
sizeof(request->data.dual_idmapset.sid)-1]='\0';
DEBUG(3, ("set_mapping %s\n", request->data.dual_idmapset.sid));
if (!string_to_sid(&state->sid, request->data.dual_idmapset.sid)) {
DEBUG(5, ("%s not a SID\n", request->data.dual_idmapset.sid));
tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
return tevent_req_post(req, ev);
}
switch (request->data.dual_idmapset.type) {
case ID_TYPE_UID:
type = WBINT_ID_TYPE_UID;
break;
case ID_TYPE_GID:
type = WBINT_ID_TYPE_GID;
break;
default:
tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
return tevent_req_post(req, ev);
}
child = idmap_child();
subreq = rpccli_wbint_SetMapping_send(state, ev, child->rpccli,
&state->sid, type,
request->data.dual_idmapset.id);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
tevent_req_set_callback(subreq, winbindd_set_mapping_done, req);
return req;
}
static void winbindd_set_mapping_done(struct tevent_req *subreq)
{
struct tevent_req *req = tevent_req_callback_data(
subreq, struct tevent_req);
struct winbindd_set_mapping_state *state = tevent_req_data(
req, struct winbindd_set_mapping_state);
NTSTATUS status, result;
status = rpccli_wbint_SetMapping_recv(subreq, state, &result);
if (!NT_STATUS_IS_OK(status)) {
tevent_req_nterror(req, status);
return;
}
if (!NT_STATUS_IS_OK(result)) {
tevent_req_nterror(req, result);
return;
}
return tevent_req_done(req);
}
NTSTATUS winbindd_set_mapping_recv(struct tevent_req *req,
struct winbindd_response *response)
{
return tevent_req_simple_recv_ntstatus(req);
}

42
source3/winbindd/winbindd_sid.c
View File

@ -25,48 +25,6 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
static void set_mapping_recv(void *private_data, bool success)
{
struct winbindd_cli_state *state =
talloc_get_type_abort(private_data, struct winbindd_cli_state);
if (!success) {
DEBUG(5, ("Could not set sid mapping\n"));
request_error(state);
return;
}
request_ok(state);
}
void winbindd_set_mapping(struct winbindd_cli_state *state)
{
struct id_map map;
DOM_SID sid;
DEBUG(3, ("[%5lu]: set id map\n", (unsigned long)state->pid));
if ( ! state->privileged) {
DEBUG(0, ("Only root is allowed to set mappings!\n"));
request_error(state);
return;
}
if (!string_to_sid(&sid, state->request->data.dual_idmapset.sid)) {
DEBUG(1, ("Could not get convert sid %s from string\n",
state->request->data.sid));
request_error(state);
return;
}
map.sid = &sid;
map.xid.id = state->request->data.dual_idmapset.id;
map.xid.type = state->request->data.dual_idmapset.type;
winbindd_set_mapping_async(state->mem_ctx, &map,
set_mapping_recv, state);
}
static void remove_mapping_recv(void *private_data, bool success)
{
struct winbindd_cli_state *state =