3 files changed, 8 insertions, 10 deletions

diff --git a/source4/libnet/libnet.c b/source4/libnet/libnet.c
index 604a2aaca4..b7b18b7417 100644
--- a/source4/libnet/libnet.c
+++ b/source4/libnet/libnet.c
@@ -38,7 +38,7 @@ struct libnet_context *libnet_context_init(struct event_context *ev)
 
 	/* events */
 	if (ev == NULL) {
-		ev = event_context_init(ctx);
+		ev = event_context_find(ctx);
 		if (ev == NULL) {
 			talloc_free(ctx);
 			return NULL;
diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c
index 7cc05324d6..67c102a3e2 100644
--- a/source4/libnet/libnet_lookup.c
+++ b/source4/libnet/libnet_lookup.c
@@ -34,7 +34,6 @@
 struct lookup_state {
 	struct composite_context *resolve_ctx;
 	struct nbt_name hostname;
-	const char **address;
 };
 
 
@@ -50,7 +49,6 @@ struct composite_context *libnet_Lookup_send(struct libnet_context *ctx,
 	struct composite_context *c;
 	struct lookup_state *s;
 	const char** methods;
-	const char* address = talloc_array(ctx, const char, 16);
 
 	if (!io) return NULL;
 
@@ -62,14 +60,13 @@ struct composite_context *libnet_Lookup_send(struct libnet_context *ctx,
 	if (s == NULL) goto failed;
 	
 	/* prepare event context */
-	c->event_ctx = event_context_init(c);
+	c->event_ctx = event_context_find(c);
 	if (c->event_ctx == NULL) goto failed;
 
 	/* parameters */
 	s->hostname.name   = talloc_strdup(s, io->in.hostname);
 	s->hostname.type   = io->in.type;
 	s->hostname.scope  = NULL;
-	s->address         = &address;
 
 	/* name resolution methods */
 	if (io->in.methods) {
@@ -106,12 +103,14 @@ NTSTATUS libnet_Lookup_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct lookup_state *s;
+	const char *address;
 
 	s = talloc_get_type(c->private_data, struct lookup_state);
 
-	status = resolve_name_recv(s->resolve_ctx, mem_ctx, s->address);
+	status = resolve_name_recv(s->resolve_ctx, mem_ctx, &address);
 	if (NT_STATUS_IS_OK(status)) {
-		io->out.address = s->address;
+		io->out.address = str_list_make(mem_ctx, address, NULL);
+		NT_STATUS_HAVE_NO_MEMORY(io->out.address);
 	}
 
 	return status;
diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c
index 7b07cedeac..9917b17255 100644
--- a/source4/libnet/libnet_rpc.c
+++ b/source4/libnet/libnet_rpc.c
@@ -77,11 +77,10 @@ static NTSTATUS libnet_RpcConnectPdc(struct libnet_context *ctx, TALLOC_CTX *mem
 	NTSTATUS status;
 	struct libnet_RpcConnect r2;
 	struct libnet_Lookup f;
-	const char *address = talloc_array(ctx, const char, 16);
 
 	f.in.hostname  = r->in.domain_name;
 	f.in.methods   = NULL;
-	f.out.address  = &address;
+	f.out.address  = NULL;
 
 	status = libnet_LookupPdc(ctx, mem_ctx, &f);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -91,7 +90,7 @@ static NTSTATUS libnet_RpcConnectPdc(struct libnet_context *ctx, TALLOC_CTX *mem
 	}
 
 	r2.level		    = LIBNET_RPC_CONNECT_SERVER;
-	r2.in.domain_name	    = talloc_strdup(mem_ctx, *f.out.address);
+	r2.in.domain_name	    = talloc_strdup(mem_ctx, f.out.address[0]);
 	r2.in.dcerpc_iface_name     = r->in.dcerpc_iface_name;
 	r2.in.dcerpc_iface_uuid	    = r->in.dcerpc_iface_uuid;
 	r2.in.dcerpc_iface_version  = r->in.dcerpc_iface_version;