4 files changed, 10 insertions, 5 deletions
diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index e11e6193fe..bb4d3a53bb 100644
--- a/source4/smbd/process_model.c
+++ b/source4/smbd/process_model.c
@@ -83,7 +83,7 @@ _PUBLIC_ NTSTATUS register_process_model(const void *_ops)
 NTSTATUS process_model_init(void)
 {
 	init_module_fn static_init[] = STATIC_process_model_MODULES;
-	init_module_fn *shared_init = load_samba_modules(NULL, "process_model");
+	init_module_fn *shared_init = load_samba_modules(NULL, global_loadparm, "process_model");
 
 	run_init_functions(static_init);
 	run_init_functions(shared_init);
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 7d84ffe812..e86ddc910b 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -93,7 +93,7 @@ static void cleanup_tmp_files(void)
 	char *path;
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
 
-	path = smbd_tmp_path(mem_ctx, NULL);
+	path = smbd_tmp_path(mem_ctx, global_loadparm, NULL);
 
 	recursive_delete(path);
 	talloc_free(mem_ctx);
@@ -296,7 +296,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 
 	process_model_init(); 
 
-	shared_init = load_samba_modules(NULL, "service");
+	shared_init = load_samba_modules(NULL, global_loadparm, "service");
 
 	run_init_functions(static_init);
 	run_init_functions(shared_init);
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index 1f1f92b495..31107df032 100644
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -181,7 +181,9 @@ static void stream_new_connection(struct event_context *ev,
 	}
 
 	/* setup to receive internal messages on this connection */
-	srv_conn->msg_ctx = messaging_init(srv_conn, srv_conn->server_id, ev);
+	srv_conn->msg_ctx = messaging_init(srv_conn, 
+					   lp_messaging_path(srv_conn, global_loadparm),
+					   srv_conn->server_id, ev);
 	if (!srv_conn->msg_ctx) {
 		stream_terminate_connection(srv_conn, "messaging_init() failed");
 		return;
diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c
index cab5c7e112..c77cae4185 100644
--- a/source4/smbd/service_task.c
+++ b/source4/smbd/service_task.c
@@ -25,6 +25,7 @@
 #include "smbd/service.h"
 #include "smbd/service_task.h"
 #include "lib/messaging/irpc.h"
+#include "param/param.h"
 
 /*
   terminate a task service
@@ -64,7 +65,9 @@ static void task_server_callback(struct event_context *event_ctx,
 	task->model_ops = state->model_ops;
 	task->server_id = server_id;
 
-	task->msg_ctx = messaging_init(task, task->server_id, task->event_ctx);
+	task->msg_ctx = messaging_init(task, 
+				       lp_messaging_path(task, global_loadparm),
+				       task->server_id, task->event_ctx);
 	if (!task->msg_ctx) {
 		task_server_terminate(task, "messaging_init() failed");
 		return;