summaryrefslogtreecommitdiff
path: root/source4/winbind
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-02 19:27:49 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:47:07 +0100
commitb5594df87d054d203e9bfb52a49c87bc3ecf46a1 (patch)
treeacc4bcd503c342ebc87970905796951e3fe042d3 /source4/winbind
parentcc04f143dcd35fb67884e385ffd3e6ed2d32a4c2 (diff)
downloadsamba-b5594df87d054d203e9bfb52a49c87bc3ecf46a1.tar.gz
samba-b5594df87d054d203e9bfb52a49c87bc3ecf46a1.tar.bz2
samba-b5594df87d054d203e9bfb52a49c87bc3ecf46a1.zip
r26230: Use task-provided loadparm context in a couple more places, avoid loadparm context inside ntlm_auth.
(This used to be commit 3a946d1ffd7739e40beab673ecb0100c178c2e28)
Diffstat (limited to 'source4/winbind')
-rw-r--r--source4/winbind/wb_server.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index 6d002902d3..4225260774 100644
--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@@ -129,7 +129,7 @@ static void winbind_task_init(struct task_server *task)
}
/* Make sure the directory for the Samba3 socket exists, and is of the correct permissions */
- if (!directory_create_or_exist(lp_winbindd_socket_directory(global_loadparm), geteuid(), 0755)) {
+ if (!directory_create_or_exist(lp_winbindd_socket_directory(task->lp_ctx), geteuid(), 0755)) {
task_server_terminate(task,
"Cannot create winbindd pipe directory");
return;
@@ -140,7 +140,7 @@ static void winbind_task_init(struct task_server *task)
service->task = task;
service->primary_sid = secrets_get_domain_sid(service,
- lp_workgroup(global_loadparm));
+ lp_workgroup(task->lp_ctx));
if (service->primary_sid == NULL) {
task_server_terminate(
task, nt_errstr(NT_STATUS_CANT_ACCESS_DOMAIN_INFO));
@@ -151,7 +151,7 @@ static void winbind_task_init(struct task_server *task)
listen_socket = talloc(service, struct wbsrv_listen_socket);
if (!listen_socket) goto nomem;
listen_socket->socket_path = talloc_asprintf(listen_socket, "%s/%s",
- lp_winbindd_socket_directory(global_loadparm),
+ lp_winbindd_socket_directory(task->lp_ctx),
WINBINDD_SAMBA3_SOCKET);
if (!listen_socket->socket_path) goto nomem;
listen_socket->service = service;
@@ -166,7 +166,7 @@ static void winbind_task_init(struct task_server *task)
listen_socket = talloc(service, struct wbsrv_listen_socket);
if (!listen_socket) goto nomem;
listen_socket->socket_path =
- smbd_tmp_path(listen_socket, global_loadparm,
+ smbd_tmp_path(listen_socket, task->lp_ctx,
WINBINDD_SAMBA3_PRIVILEGED_SOCKET);
if (!listen_socket->socket_path) goto nomem;
listen_socket->service = service;