5 files changed, 15 insertions, 6 deletions
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index 76984bf5b1..cd782066db 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -790,7 +790,7 @@ static NTSTATUS becomeDC_ldap_connect(struct libnet_BecomeDC_state *s, struct be
 	url = talloc_asprintf(s, "ldap://%s/", s->source_dsa.dns_name);
 	NT_STATUS_HAVE_NO_MEMORY(url);
 
-	ldap->ldb = ldb_wrap_connect(s, url,
+	ldap->ldb = ldb_wrap_connect(s, global_loadparm, url,
 				     NULL,
 				     s->libnet->cred,
 				     0, NULL);
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 553bde615b..1fd84146de 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -228,7 +228,8 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context *ctx, struct libnet_J
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	remote_ldb = ldb_wrap_connect(tmp_ctx, remote_ldb_url, 
+	remote_ldb = ldb_wrap_connect(tmp_ctx, global_loadparm, 
+				      remote_ldb_url, 
 				      NULL, ctx->cred, 0, NULL);
 	if (!remote_ldb) {
 		r->out.error_string = NULL;
diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c
index 6856156734..cac7086a60 100644
--- a/source4/libnet/libnet_lookup.c
+++ b/source4/libnet/libnet_lookup.c
@@ -34,6 +34,8 @@
 #include "librpc/gen_ndr/lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 
+#include "param/param.h"
+
 struct lookup_state {
 	struct nbt_name hostname;
 	const char *address;
@@ -189,7 +191,8 @@ struct composite_context* libnet_LookupDCs_send(struct libnet_context *ctx,
 						struct libnet_LookupDCs *io)
 {
 	struct composite_context *c;
-	struct messaging_context *msg_ctx = messaging_client_init(mem_ctx, ctx->event_ctx);
+	struct messaging_context *msg_ctx = 
+		messaging_client_init(mem_ctx, lp_messaging_path(mem_ctx, global_loadparm), ctx->event_ctx);
 
 	c = finddcs_send(mem_ctx, io->in.domain_name, io->in.name_type,
 			 NULL, ctx->name_res_methods, ctx->event_ctx, msg_ctx);
diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index 9511989e8c..c49d800d40 100644
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -1191,7 +1191,9 @@ static NTSTATUS libnet_samsync_ldb_init(TALLOC_CTX *mem_ctx,
 		}
 		ldap_url = talloc_asprintf(state, "ldap://%s", server);
 		
-		state->remote_ldb = ldb_wrap_connect(mem_ctx, ldap_url, 
+		state->remote_ldb = ldb_wrap_connect(mem_ctx, 
+						     global_loadparm, 
+						     ldap_url, 
 						     NULL, state->samsync_state->machine_net_ctx->cred,
 						     0, NULL);
 		if (!state->remote_ldb) {
@@ -1217,7 +1219,9 @@ NTSTATUS libnet_samsync_ldb(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, str
 	state->secrets         = NULL;
 	state->trusted_domains = NULL;
 
-	state->sam_ldb         = ldb_wrap_connect(mem_ctx, lp_sam_url(global_loadparm), 
+	state->sam_ldb         = ldb_wrap_connect(mem_ctx, 
+						  global_loadparm, 
+						  lp_sam_url(global_loadparm), 
 						  r->in.session_info,
 						  ctx->cred, 0, NULL);
 
diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c
index 643b97bc8b..40b1aab215 100644
--- a/source4/libnet/libnet_unbecome_dc.c
+++ b/source4/libnet/libnet_unbecome_dc.c
@@ -27,6 +27,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/common/flags.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
+#include "param/param.h"
 
 /*****************************************************************************
  * Windows 2003 (w2k3) does the following steps when changing the server role
@@ -307,7 +308,7 @@ static NTSTATUS unbecomeDC_ldap_connect(struct libnet_UnbecomeDC_state *s)
 	url = talloc_asprintf(s, "ldap://%s/", s->source_dsa.dns_name);
 	NT_STATUS_HAVE_NO_MEMORY(url);
 
-	s->ldap.ldb = ldb_wrap_connect(s, url,
+	s->ldap.ldb = ldb_wrap_connect(s, global_loadparm, url,
 				       NULL,
 				       s->libnet->cred,
 				       0, NULL);