From 2d8b6ce1c112731de7e2ed89ee19864f2631883d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 30 Apr 2012 19:35:25 +1000 Subject: s4-libnet: Add mem_ctx to libnet_Lookup calls (bug #8889) --- source4/libnet/libnet_lookup.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source4/libnet') diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c index f9379405d0..f5e084f6ef 100644 --- a/source4/libnet/libnet_lookup.c +++ b/source4/libnet/libnet_lookup.c @@ -47,6 +47,7 @@ static void continue_name_resolved(struct composite_context *ctx); */ struct composite_context *libnet_Lookup_send(struct libnet_context *ctx, + TALLOC_CTX *mem_ctx, struct libnet_Lookup *io) { struct composite_context *c; @@ -55,7 +56,7 @@ struct composite_context *libnet_Lookup_send(struct libnet_context *ctx, struct resolve_context *resolve_ctx; /* allocate context and state structures */ - c = composite_create(ctx, ctx->event_ctx); + c = composite_create(mem_ctx, ctx->event_ctx); if (c == NULL) return NULL; s = talloc_zero(c, struct lookup_state); @@ -144,7 +145,7 @@ NTSTATUS libnet_Lookup_recv(struct composite_context *c, TALLOC_CTX *mem_ctx, NTSTATUS libnet_Lookup(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct libnet_Lookup *io) { - struct composite_context *c = libnet_Lookup_send(ctx, io); + struct composite_context *c = libnet_Lookup_send(ctx, mem_ctx, io); return libnet_Lookup_recv(c, mem_ctx, io); } @@ -159,10 +160,11 @@ NTSTATUS libnet_Lookup(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, * Sends asynchronous LookupHost request */ struct composite_context* libnet_LookupHost_send(struct libnet_context *ctx, + TALLOC_CTX *mem_ctx, struct libnet_Lookup *io) { io->in.type = NBT_NAME_SERVER; - return libnet_Lookup_send(ctx, io); + return libnet_Lookup_send(ctx, mem_ctx, io); } @@ -173,7 +175,7 @@ struct composite_context* libnet_LookupHost_send(struct libnet_context *ctx, NTSTATUS libnet_LookupHost(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct libnet_Lookup *io) { - struct composite_context *c = libnet_LookupHost_send(ctx, io); + struct composite_context *c = libnet_LookupHost_send(ctx, mem_ctx, io); return libnet_Lookup_recv(c, mem_ctx, io); } -- cgit