s4-libnet: Add mem_ctx to libnet_rpc_groupadd calls (bug #8889)

diff --git a/source4/libnet/groupman.c b/source4/libnet/groupman.c
index c8762f4f1468d15d055b2ba9b7b50ecc13abaa9c..79fefd76e8bbdd4cd5ad07e976a7bc9d92194394 100644 (file)
--- a/source4/libnet/groupman.c
+++ b/source4/libnet/groupman.c
@@ -42,6 +42,7 @@ static void continue_groupadd_created(struct tevent_req *subreq);
 
 
 struct composite_context* libnet_rpc_groupadd_send(struct dcerpc_pipe *p,
+                                                  TALLOC_CTX *mem_ctx,
                                                   struct libnet_rpc_groupadd *io,
                                                   void (*monitor)(struct monitor_msg*))
 {
@@ -51,7 +52,7 @@ struct composite_context* libnet_rpc_groupadd_send(struct dcerpc_pipe *p,
 
        if (!p || !io) return NULL;
 
-       c = composite_create(p, dcerpc_event_context(p));
+       c = composite_create(mem_ctx, dcerpc_event_context(p));
        if (c == NULL) return NULL;
 
        s = talloc_zero(c, struct groupadd_state);
@@ -125,7 +126,7 @@ NTSTATUS libnet_rpc_groupadd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
        struct composite_context *c;
 
-       c = libnet_rpc_groupadd_send(p, io, NULL);
+       c = libnet_rpc_groupadd_send(p, mem_ctx, io, NULL);
        return libnet_rpc_groupadd_recv(c, mem_ctx, io);
 }
 

diff --git a/source4/libnet/libnet_group.c b/source4/libnet/libnet_group.c
index 5fc3f2b12a34cb89ac5e3c660895f853e8161562..c8a95d74a899c28164af406dc6d72a0d06a98552 100644 (file)
--- a/source4/libnet/libnet_group.c
+++ b/source4/libnet/libnet_group.c
@@ -76,7 +76,7 @@ struct composite_context* libnet_CreateGroup_send(struct libnet_context *ctx,
        s->group_add.in.domain_handle = ctx->samr.handle;
 
        /* send the request */
-       create_req = libnet_rpc_groupadd_send(ctx->samr.pipe, &s->group_add, monitor);
+       create_req = libnet_rpc_groupadd_send(ctx->samr.pipe, s, &s->group_add, monitor);
        if (composite_nomem(create_req, c)) return c;
 
        composite_continue(c, create_req, continue_rpc_group_added, c);
@@ -101,7 +101,7 @@ static void continue_domain_opened(struct composite_context *ctx)
        s->group_add.in.domain_handle = s->ctx->samr.handle;
 
        /* send the request */
-       create_req = libnet_rpc_groupadd_send(s->ctx->samr.pipe, &s->group_add,
+       create_req = libnet_rpc_groupadd_send(s->ctx->samr.pipe, s, &s->group_add,
                                              s->monitor_fn);
        if (composite_nomem(create_req, c)) return;