diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-05-17 19:54:00 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-05-18 13:20:30 +1000 |
| commit | e11a67de7d2b67f9efe47c471a9b35a14ec8ad47 (patch) | |
| tree | 9728f3e1b8ad46977756d050dfc676ac5643cecb | |
| parent | b183a30b2b3983a7f827dc6fd44eb16ac64904ce (diff) | |
| download | samba-e11a67de7d2b67f9efe47c471a9b35a14ec8ad47.tar.gz samba-e11a67de7d2b67f9efe47c471a9b35a14ec8ad47.tar.bz2 samba-e11a67de7d2b67f9efe47c471a9b35a14ec8ad47.zip | |
s4:winbindd Record the privilaged pipe dir
This may help us return an accurate priv pipe dir later on.
Andrew Bartlett
| -rw-r--r-- | source4/winbind/wb_server.c | 7 | ||||
| -rw-r--r-- | source4/winbind/wb_server.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c index 9e1a187d7f..2e1af61de6 100644 --- a/source4/winbind/wb_server.c +++ b/source4/winbind/wb_server.c @@ -284,11 +284,14 @@ static void winbind_task_init(struct task_server *task) return; } + service->priv_pipe_dir = lp_winbindd_privileged_socket_directory(task->lp_ctx); + service->pipe_dir = lp_winbindd_socket_directory(task->lp_ctx); + /* setup the unprivileged samba3 socket */ 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(task->lp_ctx), + service->pipe_dir, WINBINDD_SOCKET_NAME); if (!listen_socket->socket_path) goto nomem; listen_socket->service = service; @@ -305,7 +308,7 @@ static void winbind_task_init(struct task_server *task) if (!listen_socket) goto nomem; listen_socket->socket_path = talloc_asprintf(listen_socket, "%s/%s", - lp_winbindd_privileged_socket_directory(task->lp_ctx), + service->priv_pipe_dir, WINBINDD_SOCKET_NAME); if (!listen_socket->socket_path) goto nomem; listen_socket->service = service; diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h index d408fbb8e1..111aefc624 100644 --- a/source4/winbind/wb_server.h +++ b/source4/winbind/wb_server.h @@ -31,6 +31,8 @@ struct wbsrv_service { const struct dom_sid *primary_sid; struct wbsrv_domain *domains; struct idmap_context *idmap_ctx; + const char *priv_pipe_dir; + const char *pipe_dir; }; struct wbsrv_samconn { |