s4:winbind: use WINBINDD_SOCKET_NAME instead of WINBINDD_SAMBA3_SOCKET

metze

diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index 36ade7de5ebc1629245b392c93d37aa5181ad4bb..9e1a187d7f3f8168fc71d5ad34c10c11636abadb 100644 (file)
--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@@ -289,7 +289,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_socket_directory(task->lp_ctx), 
-                                                         WINBINDD_SAMBA3_SOCKET);
+                                                         WINBINDD_SOCKET_NAME);
        if (!listen_socket->socket_path) goto nomem;
        listen_socket->service          = service;
        listen_socket->privileged       = false;
@@ -306,7 +306,7 @@ static void winbind_task_init(struct task_server *task)
        listen_socket->socket_path 
                = talloc_asprintf(listen_socket, "%s/%s", 
                                  lp_winbindd_privileged_socket_directory(task->lp_ctx),
-                                 WINBINDD_SAMBA3_SOCKET);
+                                 WINBINDD_SOCKET_NAME);
        if (!listen_socket->socket_path) goto nomem;
        listen_socket->service          = service;
        listen_socket->privileged       = true;

diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h
index 3bfe58bca90f0fc3273bd5da71bcb0b9a650248e..8b79bc7406ebc675c802e45910a166d3cce8c0a6 100644 (file)
--- a/source4/winbind/wb_server.h
+++ b/source4/winbind/wb_server.h
@@ -24,8 +24,6 @@
 #include "winbind/idmap.h"
 #include "libnet/libnet.h"
 
-#define WINBINDD_SAMBA3_SOCKET "pipe"
-
 /* this struct stores global data for the winbind task */
 struct wbsrv_service {
        struct task_server *task;