diff options
author | Volker Lendecke <vl@samba.org> | 2009-08-30 09:46:34 +0200 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2009-08-30 09:48:28 +0200 |
commit | 0cae043b0c1d2fa55f6709230658155caaecb4fc (patch) | |
tree | 835f5b2809527a5952abdca6f1dd86119973be69 /source3/librpc/gen_ndr | |
parent | 9e7c6f12fdb6a8ce198359572bb9e69c7d46530a (diff) | |
download | samba-0cae043b0c1d2fa55f6709230658155caaecb4fc.tar.gz samba-0cae043b0c1d2fa55f6709230658155caaecb4fc.tar.bz2 samba-0cae043b0c1d2fa55f6709230658155caaecb4fc.zip |
w3:winbind: Convert WINBINDD_ALLOCATE_GID to the new API
Diffstat (limited to 'source3/librpc/gen_ndr')
-rw-r--r-- | source3/librpc/gen_ndr/cli_wbint.c | 157 | ||||
-rw-r--r-- | source3/librpc/gen_ndr/cli_wbint.h | 10 | ||||
-rw-r--r-- | source3/librpc/gen_ndr/ndr_wbint.c | 71 | ||||
-rw-r--r-- | source3/librpc/gen_ndr/ndr_wbint.h | 23 | ||||
-rw-r--r-- | source3/librpc/gen_ndr/srv_wbint.c | 93 | ||||
-rw-r--r-- | source3/librpc/gen_ndr/srv_wbint.h | 2 | ||||
-rw-r--r-- | source3/librpc/gen_ndr/wbint.h | 9 |
7 files changed, 354 insertions, 11 deletions
diff --git a/source3/librpc/gen_ndr/cli_wbint.c b/source3/librpc/gen_ndr/cli_wbint.c index 710e503e3c..6037b72db1 100644 --- a/source3/librpc/gen_ndr/cli_wbint.c +++ b/source3/librpc/gen_ndr/cli_wbint.c @@ -1319,6 +1319,163 @@ NTSTATUS rpccli_wbint_AllocateUid(struct rpc_pipe_client *cli, return r.out.result; } +struct rpccli_wbint_AllocateGid_state { + struct wbint_AllocateGid orig; + struct wbint_AllocateGid tmp; + TALLOC_CTX *out_mem_ctx; + NTSTATUS (*dispatch_recv)(struct tevent_req *req, TALLOC_CTX *mem_ctx); +}; + +static void rpccli_wbint_AllocateGid_done(struct tevent_req *subreq); + +struct tevent_req *rpccli_wbint_AllocateGid_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + struct rpc_pipe_client *cli, + uint64_t *_gid /* [out] [ref] */) +{ + struct tevent_req *req; + struct rpccli_wbint_AllocateGid_state *state; + struct tevent_req *subreq; + + req = tevent_req_create(mem_ctx, &state, + struct rpccli_wbint_AllocateGid_state); + if (req == NULL) { + return NULL; + } + state->out_mem_ctx = NULL; + state->dispatch_recv = cli->dispatch_recv; + + /* In parameters */ + + /* Out parameters */ + state->orig.out.gid = _gid; + + /* Result */ + ZERO_STRUCT(state->orig.out.result); + + if (DEBUGLEVEL >= 10) { + NDR_PRINT_IN_DEBUG(wbint_AllocateGid, &state->orig); + } + + state->out_mem_ctx = talloc_named_const(state, 0, + "rpccli_wbint_AllocateGid_out_memory"); + if (tevent_req_nomem(state->out_mem_ctx, req)) { + return tevent_req_post(req, ev); + } + + /* 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_ALLOCATEGID, + &state->tmp); + if (tevent_req_nomem(subreq, req)) { + return tevent_req_post(req, ev); + } + tevent_req_set_callback(subreq, rpccli_wbint_AllocateGid_done, req); + return req; +} + +static void rpccli_wbint_AllocateGid_done(struct tevent_req *subreq) +{ + struct tevent_req *req = tevent_req_callback_data( + subreq, struct tevent_req); + struct rpccli_wbint_AllocateGid_state *state = tevent_req_data( + req, struct rpccli_wbint_AllocateGid_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 */ + *state->orig.out.gid = *state->tmp.out.gid; + + /* 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_AllocateGid, &state->orig); + } + + tevent_req_done(req); +} + +NTSTATUS rpccli_wbint_AllocateGid_recv(struct tevent_req *req, + TALLOC_CTX *mem_ctx, + NTSTATUS *result) +{ + struct rpccli_wbint_AllocateGid_state *state = tevent_req_data( + req, struct rpccli_wbint_AllocateGid_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_AllocateGid(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint64_t *gid /* [out] [ref] */) +{ + struct wbint_AllocateGid r; + NTSTATUS status; + + /* In parameters */ + + if (DEBUGLEVEL >= 10) { + NDR_PRINT_IN_DEBUG(wbint_AllocateGid, &r); + } + + status = cli->dispatch(cli, + mem_ctx, + &ndr_table_wbint, + NDR_WBINT_ALLOCATEGID, + &r); + + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + if (DEBUGLEVEL >= 10) { + NDR_PRINT_OUT_DEBUG(wbint_AllocateGid, &r); + } + + if (NT_STATUS_IS_ERR(status)) { + return status; + } + + /* Return variables */ + *gid = *r.out.gid; + + /* Return result */ + return r.out.result; +} + struct rpccli_wbint_QueryUser_state { struct wbint_QueryUser orig; struct wbint_QueryUser tmp; diff --git a/source3/librpc/gen_ndr/cli_wbint.h b/source3/librpc/gen_ndr/cli_wbint.h index f5fd812073..c535dbbd38 100644 --- a/source3/librpc/gen_ndr/cli_wbint.h +++ b/source3/librpc/gen_ndr/cli_wbint.h @@ -112,6 +112,16 @@ NTSTATUS rpccli_wbint_AllocateUid_recv(struct tevent_req *req, NTSTATUS rpccli_wbint_AllocateUid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint64_t *uid /* [out] [ref] */); +struct tevent_req *rpccli_wbint_AllocateGid_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + struct rpc_pipe_client *cli, + uint64_t *_gid /* [out] [ref] */); +NTSTATUS rpccli_wbint_AllocateGid_recv(struct tevent_req *req, + TALLOC_CTX *mem_ctx, + NTSTATUS *result); +NTSTATUS rpccli_wbint_AllocateGid(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint64_t *gid /* [out] [ref] */); struct tevent_req *rpccli_wbint_QueryUser_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct rpc_pipe_client *cli, diff --git a/source3/librpc/gen_ndr/ndr_wbint.c b/source3/librpc/gen_ndr/ndr_wbint.c index 1476e06e75..5f294d0b44 100644 --- a/source3/librpc/gen_ndr/ndr_wbint.c +++ b/source3/librpc/gen_ndr/ndr_wbint.c @@ -1319,6 +1319,67 @@ _PUBLIC_ void ndr_print_wbint_AllocateUid(struct ndr_print *ndr, const char *nam ndr->depth--; } +static enum ndr_err_code ndr_push_wbint_AllocateGid(struct ndr_push *ndr, int flags, const struct wbint_AllocateGid *r) +{ + if (flags & NDR_IN) { + } + if (flags & NDR_OUT) { + if (r->out.gid == NULL) { + return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer"); + } + NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, *r->out.gid)); + NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result)); + } + return NDR_ERR_SUCCESS; +} + +static enum ndr_err_code ndr_pull_wbint_AllocateGid(struct ndr_pull *ndr, int flags, struct wbint_AllocateGid *r) +{ + TALLOC_CTX *_mem_save_gid_0; + if (flags & NDR_IN) { + ZERO_STRUCT(r->out); + + NDR_PULL_ALLOC(ndr, r->out.gid); + ZERO_STRUCTP(r->out.gid); + } + if (flags & NDR_OUT) { + if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { + NDR_PULL_ALLOC(ndr, r->out.gid); + } + _mem_save_gid_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->out.gid, LIBNDR_FLAG_REF_ALLOC); + NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, r->out.gid)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_gid_0, LIBNDR_FLAG_REF_ALLOC); + NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result)); + } + return NDR_ERR_SUCCESS; +} + +_PUBLIC_ void ndr_print_wbint_AllocateGid(struct ndr_print *ndr, const char *name, int flags, const struct wbint_AllocateGid *r) +{ + ndr_print_struct(ndr, name, "wbint_AllocateGid"); + ndr->depth++; + if (flags & NDR_SET_VALUES) { + ndr->flags |= LIBNDR_PRINT_SET_VALUES; + } + if (flags & NDR_IN) { + ndr_print_struct(ndr, "in", "wbint_AllocateGid"); + ndr->depth++; + ndr->depth--; + } + if (flags & NDR_OUT) { + ndr_print_struct(ndr, "out", "wbint_AllocateGid"); + ndr->depth++; + ndr_print_ptr(ndr, "gid", r->out.gid); + ndr->depth++; + ndr_print_hyper(ndr, "gid", *r->out.gid); + ndr->depth--; + ndr_print_NTSTATUS(ndr, "result", r->out.result); + ndr->depth--; + } + ndr->depth--; +} + static enum ndr_err_code ndr_push_wbint_QueryUser(struct ndr_push *ndr, int flags, const struct wbint_QueryUser *r) { if (flags & NDR_IN) { @@ -2116,6 +2177,14 @@ static const struct ndr_interface_call wbint_calls[] = { false, }, { + "wbint_AllocateGid", + sizeof(struct wbint_AllocateGid), + (ndr_push_flags_fn_t) ndr_push_wbint_AllocateGid, + (ndr_pull_flags_fn_t) ndr_pull_wbint_AllocateGid, + (ndr_print_function_t) ndr_print_wbint_AllocateGid, + false, + }, + { "wbint_QueryUser", sizeof(struct wbint_QueryUser), (ndr_push_flags_fn_t) ndr_push_wbint_QueryUser, @@ -2216,7 +2285,7 @@ const struct ndr_interface_table ndr_table_wbint = { NDR_WBINT_VERSION }, .helpstring = NDR_WBINT_HELPSTRING, - .num_calls = 17, + .num_calls = 18, .calls = wbint_calls, .endpoints = &wbint_endpoints, .authservices = &wbint_authservices diff --git a/source3/librpc/gen_ndr/ndr_wbint.h b/source3/librpc/gen_ndr/ndr_wbint.h index 65eae1cc47..35286d4b2c 100644 --- a/source3/librpc/gen_ndr/ndr_wbint.h +++ b/source3/librpc/gen_ndr/ndr_wbint.h @@ -27,25 +27,27 @@ extern const struct ndr_interface_table ndr_table_wbint; #define NDR_WBINT_ALLOCATEUID (0x07) -#define NDR_WBINT_QUERYUSER (0x08) +#define NDR_WBINT_ALLOCATEGID (0x08) -#define NDR_WBINT_LOOKUPUSERALIASES (0x09) +#define NDR_WBINT_QUERYUSER (0x09) -#define NDR_WBINT_LOOKUPUSERGROUPS (0x0a) +#define NDR_WBINT_LOOKUPUSERALIASES (0x0a) -#define NDR_WBINT_QUERYSEQUENCENUMBER (0x0b) +#define NDR_WBINT_LOOKUPUSERGROUPS (0x0b) -#define NDR_WBINT_LOOKUPGROUPMEMBERS (0x0c) +#define NDR_WBINT_QUERYSEQUENCENUMBER (0x0c) -#define NDR_WBINT_QUERYUSERLIST (0x0d) +#define NDR_WBINT_LOOKUPGROUPMEMBERS (0x0d) -#define NDR_WBINT_QUERYGROUPLIST (0x0e) +#define NDR_WBINT_QUERYUSERLIST (0x0e) -#define NDR_WBINT_DSGETDCNAME (0x0f) +#define NDR_WBINT_QUERYGROUPLIST (0x0f) -#define NDR_WBINT_LOOKUPRIDS (0x10) +#define NDR_WBINT_DSGETDCNAME (0x10) -#define NDR_WBINT_CALL_COUNT (17) +#define NDR_WBINT_LOOKUPRIDS (0x11) + +#define NDR_WBINT_CALL_COUNT (18) 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); @@ -72,6 +74,7 @@ void ndr_print_wbint_Sid2Gid(struct ndr_print *ndr, const char *name, int flags, void ndr_print_wbint_Uid2Sid(struct ndr_print *ndr, const char *name, int flags, const struct wbint_Uid2Sid *r); void ndr_print_wbint_Gid2Sid(struct ndr_print *ndr, const char *name, int flags, const struct wbint_Gid2Sid *r); void ndr_print_wbint_AllocateUid(struct ndr_print *ndr, const char *name, int flags, const struct wbint_AllocateUid *r); +void ndr_print_wbint_AllocateGid(struct ndr_print *ndr, const char *name, int flags, const struct wbint_AllocateGid *r); void ndr_print_wbint_QueryUser(struct ndr_print *ndr, const char *name, int flags, const struct wbint_QueryUser *r); void ndr_print_wbint_LookupUserAliases(struct ndr_print *ndr, const char *name, int flags, const struct wbint_LookupUserAliases *r); void ndr_print_wbint_LookupUserGroups(struct ndr_print *ndr, const char *name, int flags, const struct wbint_LookupUserGroups *r); diff --git a/source3/librpc/gen_ndr/srv_wbint.c b/source3/librpc/gen_ndr/srv_wbint.c index 498784d249..cc62b4067b 100644 --- a/source3/librpc/gen_ndr/srv_wbint.c +++ b/source3/librpc/gen_ndr/srv_wbint.c @@ -664,6 +664,86 @@ static bool api_wbint_AllocateUid(pipes_struct *p) return true; } +static bool api_wbint_AllocateGid(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_AllocateGid *r; + + call = &ndr_table_wbint.calls[NDR_WBINT_ALLOCATEGID]; + + r = talloc(talloc_tos(), struct wbint_AllocateGid); + 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_AllocateGid, r); + } + + ZERO_STRUCT(r->out); + r->out.gid = talloc_zero(r, uint64_t); + if (r->out.gid == NULL) { + talloc_free(r); + return false; + } + + r->out.result = _wbint_AllocateGid(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_AllocateGid, 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; +} + static bool api_wbint_QueryUser(pipes_struct *p) { const struct ndr_interface_call *call; @@ -1396,6 +1476,7 @@ static struct api_struct api_wbint_cmds[] = {"WBINT_UID2SID", NDR_WBINT_UID2SID, api_wbint_Uid2Sid}, {"WBINT_GID2SID", NDR_WBINT_GID2SID, api_wbint_Gid2Sid}, {"WBINT_ALLOCATEUID", NDR_WBINT_ALLOCATEUID, api_wbint_AllocateUid}, + {"WBINT_ALLOCATEGID", NDR_WBINT_ALLOCATEGID, api_wbint_AllocateGid}, {"WBINT_QUERYUSER", NDR_WBINT_QUERYUSER, api_wbint_QueryUser}, {"WBINT_LOOKUPUSERALIASES", NDR_WBINT_LOOKUPUSERALIASES, api_wbint_LookupUserAliases}, {"WBINT_LOOKUPUSERGROUPS", NDR_WBINT_LOOKUPUSERGROUPS, api_wbint_LookupUserGroups}, @@ -1532,6 +1613,18 @@ NTSTATUS rpc_wbint_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, co return NT_STATUS_OK; } + case NDR_WBINT_ALLOCATEGID: { + struct wbint_AllocateGid *r = (struct wbint_AllocateGid *)_r; + ZERO_STRUCT(r->out); + r->out.gid = talloc_zero(mem_ctx, uint64_t); + if (r->out.gid == NULL) { + return NT_STATUS_NO_MEMORY; + } + + r->out.result = _wbint_AllocateGid(cli->pipes_struct, r); + return NT_STATUS_OK; + } + case NDR_WBINT_QUERYUSER: { struct wbint_QueryUser *r = (struct wbint_QueryUser *)_r; ZERO_STRUCT(r->out); diff --git a/source3/librpc/gen_ndr/srv_wbint.h b/source3/librpc/gen_ndr/srv_wbint.h index 97aec299a8..c0c3a03326 100644 --- a/source3/librpc/gen_ndr/srv_wbint.h +++ b/source3/librpc/gen_ndr/srv_wbint.h @@ -9,6 +9,7 @@ NTSTATUS _wbint_Sid2Gid(pipes_struct *p, struct wbint_Sid2Gid *r); NTSTATUS _wbint_Uid2Sid(pipes_struct *p, struct wbint_Uid2Sid *r); NTSTATUS _wbint_Gid2Sid(pipes_struct *p, struct wbint_Gid2Sid *r); NTSTATUS _wbint_AllocateUid(pipes_struct *p, struct wbint_AllocateUid *r); +NTSTATUS _wbint_AllocateGid(pipes_struct *p, struct wbint_AllocateGid *r); NTSTATUS _wbint_QueryUser(pipes_struct *p, struct wbint_QueryUser *r); NTSTATUS _wbint_LookupUserAliases(pipes_struct *p, struct wbint_LookupUserAliases *r); NTSTATUS _wbint_LookupUserGroups(pipes_struct *p, struct wbint_LookupUserGroups *r); @@ -28,6 +29,7 @@ NTSTATUS _wbint_Sid2Gid(pipes_struct *p, struct wbint_Sid2Gid *r); NTSTATUS _wbint_Uid2Sid(pipes_struct *p, struct wbint_Uid2Sid *r); NTSTATUS _wbint_Gid2Sid(pipes_struct *p, struct wbint_Gid2Sid *r); NTSTATUS _wbint_AllocateUid(pipes_struct *p, struct wbint_AllocateUid *r); +NTSTATUS _wbint_AllocateGid(pipes_struct *p, struct wbint_AllocateGid *r); NTSTATUS _wbint_QueryUser(pipes_struct *p, struct wbint_QueryUser *r); NTSTATUS _wbint_LookupUserAliases(pipes_struct *p, struct wbint_LookupUserAliases *r); NTSTATUS _wbint_LookupUserGroups(pipes_struct *p, struct wbint_LookupUserGroups *r); diff --git a/source3/librpc/gen_ndr/wbint.h b/source3/librpc/gen_ndr/wbint.h index caabfcc9eb..fa2301143f 100644 --- a/source3/librpc/gen_ndr/wbint.h +++ b/source3/librpc/gen_ndr/wbint.h @@ -153,6 +153,15 @@ struct wbint_AllocateUid { }; +struct wbint_AllocateGid { + struct { + uint64_t *gid;/* [ref] */ + NTSTATUS result; + } out; + +}; + + struct wbint_QueryUser { struct { struct dom_sid *sid;/* [ref] */ |