diff options
Diffstat (limited to 'source4/winbind/wb_server.c')
| -rw-r--r-- | source4/winbind/wb_server.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c index 3793275aa3..6d002902d3 100644 --- a/source4/winbind/wb_server.c +++ b/source4/winbind/wb_server.c @@ -31,6 +31,7 @@ #include "lib/stream/packet.h" #include "smbd/service.h" #include "param/secrets.h" +#include "param/param.h" void wbsrv_terminate_connection(struct wbsrv_connection *wbconn, const char *reason) { @@ -128,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(), geteuid(), 0755)) { + if (!directory_create_or_exist(lp_winbindd_socket_directory(global_loadparm), geteuid(), 0755)) { task_server_terminate(task, "Cannot create winbindd pipe directory"); return; @@ -139,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()); + lp_workgroup(global_loadparm)); if (service->primary_sid == NULL) { task_server_terminate( task, nt_errstr(NT_STATUS_CANT_ACCESS_DOMAIN_INFO)); @@ -150,11 +151,11 @@ 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(), + lp_winbindd_socket_directory(global_loadparm), WINBINDD_SAMBA3_SOCKET); if (!listen_socket->socket_path) goto nomem; listen_socket->service = service; - listen_socket->privileged = False; + listen_socket->privileged = false; status = stream_setup_socket(task->event_ctx, model_ops, &wbsrv_ops, "unix", listen_socket->socket_path, &port, @@ -165,11 +166,11 @@ 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, + smbd_tmp_path(listen_socket, global_loadparm, WINBINDD_SAMBA3_PRIVILEGED_SOCKET); if (!listen_socket->socket_path) goto nomem; listen_socket->service = service; - listen_socket->privileged = True; + listen_socket->privileged = true; status = stream_setup_socket(task->event_ctx, model_ops, &wbsrv_ops, "unix", listen_socket->socket_path, &port, |