r25398: Parse loadparm context to all lp_*() functions.

(This used to be commit 3fcc960839c6e5ca4de2c3c042f12f369ac5f238)

3 files changed, 7 insertions, 6 deletions

diff --git a/source4/smbd/pidfile.c b/source4/smbd/pidfile.c
index 57ff68709f..9a8b095f15 100644
--- a/source4/smbd/pidfile.c
+++ b/source4/smbd/pidfile.c
@@ -40,7 +40,7 @@ pid_t pidfile_pid(const char *name)
 	pid_t ret;
 	char *pidFile;
 
-	asprintf(&pidFile, "%s/%s.pid", lp_piddir(), name);
+	asprintf(&pidFile, "%s/%s.pid", lp_piddir(global_loadparm), name);
 
 	fd = open(pidFile, O_NONBLOCK | O_RDONLY, 0644);
 
@@ -87,7 +87,7 @@ void pidfile_create(const char *name)
 	char *pidFile;
 	pid_t pid;
 
-	asprintf(&pidFile, "%s/%s.pid", lp_piddir(), name);
+	asprintf(&pidFile, "%s/%s.pid", lp_piddir(global_loadparm), name);
 
 	pid = pidfile_pid(name);
 	if (pid != 0) {
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 23d996bf2e..7d84ffe812 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -269,8 +269,8 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 
 	cleanup_tmp_files();
 
-	if (!directory_exist(lp_lockdir())) {
-		mkdir(lp_lockdir(), 0755);
+	if (!directory_exist(lp_lockdir(global_loadparm))) {
+		mkdir(lp_lockdir(global_loadparm), 0755);
 	}
 
 	pidfile_create(binary_name);
@@ -329,7 +329,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 	}
 
 	DEBUG(0,("%s: using '%s' process model\n", binary_name, model));
-	status = server_service_startup(event_ctx, model, lp_server_services());
+	status = server_service_startup(event_ctx, model, lp_server_services(global_loadparm));
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("Starting Services failed - %s\n", nt_errstr(status)));
 		return 1;
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index 794fd4f5b1..1f1f92b495 100644
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -258,7 +258,8 @@ NTSTATUS stream_setup_socket(struct event_context *event_context,
 	status = socket_set_option(stream_socket->sock, "SO_KEEPALIVE", NULL);
 	NT_STATUS_NOT_OK_RETURN(status);
 
-	status = socket_set_option(stream_socket->sock, lp_socket_options(), NULL);
+	status = socket_set_option(stream_socket->sock, lp_socket_options(global_loadparm), 
+				   NULL);
 	NT_STATUS_NOT_OK_RETURN(status);
 
 	/* TODO: set socket ACL's here when they're implemented */