summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-04-15 09:29:33 +0200
committerStefan Metzmacher <metze@samba.org>2010-04-15 09:34:02 +0200
commit7f6cdad706b7171d76eddae40b17a07acc15aef8 (patch)
tree8cb3bee28c5007d9bf31655046542c1580011e10
parenta1cf6a52af5eb9766105870c2eb5470855fbd1e7 (diff)
downloadsamba-7f6cdad706b7171d76eddae40b17a07acc15aef8.tar.gz
samba-7f6cdad706b7171d76eddae40b17a07acc15aef8.tar.bz2
samba-7f6cdad706b7171d76eddae40b17a07acc15aef8.zip
s4:winbind: use WINBINDD_SOCKET_NAME instead of WINBINDD_SAMBA3_SOCKET
metze
-rw-r--r--source4/winbind/wb_server.c4
-rw-r--r--source4/winbind/wb_server.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index 36ade7de5e..9e1a187d7f 100644
--- 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 3bfe58bca9..8b79bc7406 100644
--- 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;