summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-09-09 21:25:03 -0700
committerJeremy Allison <jra@samba.org>2008-09-09 21:25:03 -0700
commit238679edfa8aabff0e5b25922aee712673be2542 (patch)
treed1859e14cd0a48644e725cf4615aabe265afa7bb /source4
parentbc731db85423a1f2d8dd8d205c702e49ea9347f3 (diff)
parent9bc4d3ecba6395be2dff195fdc1ae74d07155a42 (diff)
downloadsamba-238679edfa8aabff0e5b25922aee712673be2542.tar.gz
samba-238679edfa8aabff0e5b25922aee712673be2542.tar.bz2
samba-238679edfa8aabff0e5b25922aee712673be2542.zip
Merge branch 'v4-0-test' of ssh://jra@git.samba.org/data/git/samba into v4-0-test
(This used to be commit 7cd0977a28e9973ff71e9e0146fef6e6771a72b5)
Diffstat (limited to 'source4')
-rw-r--r--source4/winbind/wb_samba3_cmd.c3
-rw-r--r--source4/winbind/wb_server.c4
-rw-r--r--source4/winbind/wb_server.h2
3 files changed, 6 insertions, 3 deletions
diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index 5ef0339ecb..c2ba55ff18 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -113,8 +113,7 @@ NTSTATUS wbsrv_samba3_netbios_name(struct wbsrv_samba3_call *s3call)
NTSTATUS wbsrv_samba3_priv_pipe_dir(struct wbsrv_samba3_call *s3call)
{
- char *path = smbd_tmp_path(s3call, s3call->wbconn->lp_ctx, WINBINDD_SAMBA3_PRIVILEGED_SOCKET);
- NT_STATUS_HAVE_NO_MEMORY(path);
+ char *path = s3call->wbconn->listen_socket->service->priv_socket_path;
s3call->response.result = WINBINDD_OK;
s3call->response.extra_data.data = path;
diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index 97646f2849..d56a82ea18 100644
--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@@ -182,7 +182,9 @@ static void winbind_task_init(struct task_server *task)
/* setup the privileged 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",
+ listen_socket->socket_path
+ = service->priv_socket_path
+ = talloc_asprintf(listen_socket, "%s/%s",
lp_winbindd_privileged_socket_directory(task->lp_ctx),
WINBINDD_SAMBA3_SOCKET);
if (!listen_socket->socket_path) goto nomem;
diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h
index 5a7ba7b401..97d7d8151e 100644
--- a/source4/winbind/wb_server.h
+++ b/source4/winbind/wb_server.h
@@ -35,6 +35,8 @@ struct wbsrv_service {
const struct dom_sid *primary_sid;
struct wbsrv_domain *domains;
struct idmap_context *idmap_ctx;
+
+ const char *priv_socket_path;
};
struct wbsrv_samconn {