Return the same privilaged winbindd socket as we actually use.

Andrew Bartlett
(This used to be commit 2209787812fd9224d104f332e25d8ce64ef9ee95)

diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index 5ef0339ecb127ae9f047bf2958884a332aca4c51..c2ba55ff18c39914f25828fce31bc5513da9bc03 100644 (file)
--- 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 97646f2849f2045f729ab6570a46514507d2509f..d56a82ea18d872f7b609bc70e0385898e2bfba09 100644 (file)
--- 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 5a7ba7b4012e4a5872ba4f1a8e816585d504632b..97d7d8151e35db25c1576dbf81f66ba9469c2815 100644 (file)
--- 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 {