r26238: Add a loadparm context parameter to torture_context, remove more uses of global_loadparm.

(This used to be commit a33a5530545086b81a3b205aa109dff11c546926)

2 files changed, 8 insertions, 5 deletions

diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index ac5c589932..57a6e8ea11 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -175,10 +175,11 @@ static const struct stream_server_ops smb_stream_ops = {
   setup a listening socket on all the SMB ports for a particular address
 */
 _PUBLIC_ NTSTATUS smbsrv_add_socket(struct event_context *event_context,
+				    struct loadparm_context *lp_ctx,
 			       const struct model_ops *model_ops,
 			       const char *address)
 {
-	const char **ports = lp_smb_ports(global_loadparm);
+	const char **ports = lp_smb_ports(lp_ctx);
 	int i;
 	NTSTATUS status;
 
@@ -215,7 +216,7 @@ static void smbsrv_task_init(struct task_server *task)
 
 	task_server_set_title(task, "task[smbsrv]");
 
-	if (lp_interfaces(global_loadparm) && lp_bind_interfaces_only(global_loadparm)) {
+	if (lp_interfaces(task->lp_ctx) && lp_bind_interfaces_only(task->lp_ctx)) {
 		int num_interfaces = iface_count();
 		int i;
 
@@ -225,13 +226,13 @@ static void smbsrv_task_init(struct task_server *task)
 		*/
 		for(i = 0; i < num_interfaces; i++) {
 			const char *address = iface_n_ip(i);
-			status = smbsrv_add_socket(task->event_ctx, task->model_ops, address);
+			status = smbsrv_add_socket(task->event_ctx, task->lp_ctx, task->model_ops, address);
 			if (!NT_STATUS_IS_OK(status)) goto failed;
 		}
 	} else {
 		/* Just bind to lp_socket_address() (usually 0.0.0.0) */
-		status = smbsrv_add_socket(task->event_ctx, task->model_ops, 
-					   lp_socket_address(global_loadparm));
+		status = smbsrv_add_socket(task->event_ctx, task->lp_ctx, task->model_ops, 
+					   lp_socket_address(task->lp_ctx));
 		if (!NT_STATUS_IS_OK(status)) goto failed;
 	}
 
diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index 4af6ef1362..5aa2e0b6ce 100644
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -377,8 +377,10 @@ struct smbsrv_connection {
 };
 
 struct model_ops;
+struct loadparm_context;
 
 NTSTATUS smbsrv_add_socket(struct event_context *event_context,
+			   struct loadparm_context *lp_ctx,
 			       const struct model_ops *model_ops,
 			       const char *address);