From 7159060450e4d5cd3d71e6a5c7837dcd648a6220 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 6 Sep 2009 14:47:06 +0200 Subject: s3:winbind: Convert WINBINDD_SET_MAPPING to the new API --- source3/winbindd/winbindd.c | 3 +- source3/winbindd/winbindd_dual_srv.c | 22 +++++++ source3/winbindd/winbindd_idmap.c | 61 ------------------ source3/winbindd/winbindd_proto.h | 7 +++ source3/winbindd/winbindd_set_mapping.c | 106 ++++++++++++++++++++++++++++++++ source3/winbindd/winbindd_sid.c | 42 ------------- 6 files changed, 137 insertions(+), 104 deletions(-) create mode 100644 source3/winbindd/winbindd_set_mapping.c (limited to 'source3/winbindd') diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 7c1281247e..b29c646631 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -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 } }; diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c index b36bfbf93b..2a6f7ce99d 100644 --- a/source3/winbindd/winbindd_dual_srv.c +++ b/source3/winbindd/winbindd_dual_srv.c @@ -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); +} diff --git a/source3/winbindd/winbindd_idmap.c b/source3/winbindd/winbindd_idmap.c index b1a06efa1e..a59907243f 100644 --- a/source3/winbindd/winbindd_idmap.c +++ b/source3/winbindd/winbindd_idmap.c @@ -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, diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 9675430ec2..1b99935be1 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -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_ */ diff --git a/source3/winbindd/winbindd_set_mapping.c b/source3/winbindd/winbindd_set_mapping.c new file mode 100644 index 0000000000..970ba7a4e1 --- /dev/null +++ b/source3/winbindd/winbindd_set_mapping.c @@ -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 . +*/ + +#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); +} diff --git a/source3/winbindd/winbindd_sid.c b/source3/winbindd/winbindd_sid.c index 80d4677d75..5c9bb4dba9 100644 --- a/source3/winbindd/winbindd_sid.c +++ b/source3/winbindd/winbindd_sid.c @@ -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 = -- cgit