sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

s4:libnet: let libnet_rpc_usermod_send() take tevent_context/dcerpc_binding_handle

Browse Source 
This avoids usage/dereferencing 'struct dcerpc_pipe'.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
This commit is contained in:
Stefan Metzmacher
2014-01-14 12:11:17 +01:00
committed by Günther Deschner
parent 5bbcec0c2a
commit f33a558750
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source4/libnet/libnet_user.c
View File

@ -495,7 +495,9 @@ static void continue_rpc_userinfo(struct composite_context *ctx)
c->status = set_user_changes(c, &s->user_mod.in.change, &s->user_info, &s->r); c->status = set_user_changes(c, &s->user_mod.in.change, &s->user_info, &s->r);
usermod_req = libnet_rpc_usermod_send(s->ctx->samr.pipe, s, &s->user_mod, s->monitor_fn); usermod_req = libnet_rpc_usermod_send(s, s->ctx->event_ctx,
s->ctx->samr.samr_handle,
&s->user_mod, s->monitor_fn);
if (composite_nomem(usermod_req, c)) return; if (composite_nomem(usermod_req, c)) return;
composite_continue(c, usermod_req, continue_rpc_usermod, c); composite_continue(c, usermod_req, continue_rpc_usermod, c);

24
source4/libnet/userman.c
View File

@ -475,7 +475,7 @@ static void continue_usermod_user_changed(struct tevent_req *subreq);
struct usermod_state { struct usermod_state {
struct dcerpc_pipe *pipe; struct dcerpc_binding_handle *binding_handle;
struct policy_handle domain_handle; struct policy_handle domain_handle;
struct policy_handle user_handle; struct policy_handle user_handle;
struct usermod_change change; struct usermod_change change;
@ -545,7 +545,7 @@ static void continue_usermod_name_found(struct tevent_req *subreq)
/* send the rpc request */ /* send the rpc request */
subreq = dcerpc_samr_OpenUser_r_send(s, c->event_ctx, subreq = dcerpc_samr_OpenUser_r_send(s, c->event_ctx,
s->pipe->binding_handle, s->binding_handle,
&s->openuser); &s->openuser);
if (composite_nomem(subreq, c)) return; if (composite_nomem(subreq, c)) return;
@ -701,7 +701,7 @@ static NTSTATUS usermod_change(struct composite_context *c,
/* send query user info request to retrieve complete data of /* send query user info request to retrieve complete data of
a particular info level */ a particular info level */
subreq = dcerpc_samr_QueryUserInfo_r_send(s, c->event_ctx, subreq = dcerpc_samr_QueryUserInfo_r_send(s, c->event_ctx,
s->pipe->binding_handle, s->binding_handle,
&s->queryuser); &s->queryuser);
if (composite_nomem(subreq, c)) return NT_STATUS_NO_MEMORY; if (composite_nomem(subreq, c)) return NT_STATUS_NO_MEMORY;
tevent_req_set_callback(subreq, continue_usermod_user_queried, c); tevent_req_set_callback(subreq, continue_usermod_user_queried, c);
@ -713,7 +713,7 @@ static NTSTATUS usermod_change(struct composite_context *c,
/* send set user info request after making required change */ /* send set user info request after making required change */
subreq = dcerpc_samr_SetUserInfo_r_send(s, c->event_ctx, subreq = dcerpc_samr_SetUserInfo_r_send(s, c->event_ctx,
s->pipe->binding_handle, s->binding_handle,
&s->setuser); &s->setuser);
if (composite_nomem(subreq, c)) return NT_STATUS_NO_MEMORY; if (composite_nomem(subreq, c)) return NT_STATUS_NO_MEMORY;
tevent_req_set_callback(subreq, continue_usermod_user_changed, c); tevent_req_set_callback(subreq, continue_usermod_user_changed, c);
@ -787,7 +787,7 @@ static void continue_usermod_user_queried(struct tevent_req *subreq)
/* send the rpc request */ /* send the rpc request */
subreq = dcerpc_samr_SetUserInfo_r_send(s, c->event_ctx, subreq = dcerpc_samr_SetUserInfo_r_send(s, c->event_ctx,
s->pipe->binding_handle, s->binding_handle,
&s->setuser); &s->setuser);
if (composite_nomem(subreq, c)) return; if (composite_nomem(subreq, c)) return;
tevent_req_set_callback(subreq, continue_usermod_user_changed, c); tevent_req_set_callback(subreq, continue_usermod_user_changed, c);
@ -836,8 +836,9 @@ static void continue_usermod_user_changed(struct tevent_req *subreq)
* @param monitor monitor function for providing information about the progress * @param monitor monitor function for providing information about the progress
*/ */
struct composite_context *libnet_rpc_usermod_send(struct dcerpc_pipe *p, struct composite_context *libnet_rpc_usermod_send(TALLOC_CTX *mem_ctx,
TALLOC_CTX *mem_ctx, struct tevent_context *ev,
struct dcerpc_binding_handle *b,
struct libnet_rpc_usermod *io, struct libnet_rpc_usermod *io,
void (*monitor)(struct monitor_msg*)) void (*monitor)(struct monitor_msg*))
{ {
@ -846,7 +847,7 @@ struct composite_context *libnet_rpc_usermod_send(struct dcerpc_pipe *p,
struct tevent_req *subreq; struct tevent_req *subreq;
/* composite context allocation and setup */ /* composite context allocation and setup */
c = composite_create(mem_ctx, dcerpc_event_context(p)); c = composite_create(mem_ctx, ev);
if (c == NULL) return NULL; if (c == NULL) return NULL;
s = talloc_zero(c, struct usermod_state); s = talloc_zero(c, struct usermod_state);
if (composite_nomem(s, c)) return c; if (composite_nomem(s, c)) return c;
@ -854,7 +855,7 @@ struct composite_context *libnet_rpc_usermod_send(struct dcerpc_pipe *p,
c->private_data = s; c->private_data = s;
/* store parameters in the call structure */ /* store parameters in the call structure */
s->pipe = p; s->binding_handle= b;
s->domain_handle = io->in.domain_handle; s->domain_handle = io->in.domain_handle;
s->change = io->in.change; s->change = io->in.change;
s->monitor_fn = monitor; s->monitor_fn = monitor;
@ -871,7 +872,7 @@ struct composite_context *libnet_rpc_usermod_send(struct dcerpc_pipe *p,
/* send the rpc request */ /* send the rpc request */
subreq = dcerpc_samr_LookupNames_r_send(s, c->event_ctx, subreq = dcerpc_samr_LookupNames_r_send(s, c->event_ctx,
p->binding_handle, s->binding_handle,
&s->lookupname); &s->lookupname);
if (composite_nomem(subreq, c)) return c; if (composite_nomem(subreq, c)) return c;
@ -915,6 +916,7 @@ NTSTATUS libnet_rpc_usermod(struct dcerpc_pipe *p,
TALLOC_CTX *mem_ctx, TALLOC_CTX *mem_ctx,
struct libnet_rpc_usermod *io) struct libnet_rpc_usermod *io)
{ {
struct composite_context *c = libnet_rpc_usermod_send(p, mem_ctx, io, NULL); struct composite_context *c = libnet_rpc_usermod_send(mem_ctx, p->conn->event_ctx,
p->binding_handle, io, NULL);
return libnet_rpc_usermod_recv(c, mem_ctx, io); return libnet_rpc_usermod_recv(c, mem_ctx, io);
} }