[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  7f6cdad... s4:winbind: use WINBINDD_SOCKET_NAME instead of WINBINDD_SAMBA3_SOCKET
       via  a1cf6a5... s4:winbind: wbsrv_samba3_priv_pipe_dir() needs to return the directory not the pipe path
      from  2fd0137... s4:selftest/wscript: --enable-selftest and --with-selftest-prefix are configure options

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7f6cdad706b7171d76eddae40b17a07acc15aef8
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Apr 15 09:29:33 2010 +0200

    s4:winbind: use WINBINDD_SOCKET_NAME instead of WINBINDD_SAMBA3_SOCKET
    
    metze

commit a1cf6a52af5eb9766105870c2eb5470855fbd1e7
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Apr 15 09:24:56 2010 +0200

    s4:winbind: wbsrv_samba3_priv_pipe_dir() needs to return the directory not the pipe path
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source4/winbind/wb_samba3_cmd.c |    8 +++++---
 source4/winbind/wb_server.c     |    6 ++----
 source4/winbind/wb_server.h     |    6 ------
 3 files changed, 7 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index d245d7a..077dcbe 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -215,11 +215,13 @@ NTSTATUS wbsrv_samba3_netbios_name(struct wbsrv_samba3_call *s3call)
 
 NTSTATUS wbsrv_samba3_priv_pipe_dir(struct wbsrv_samba3_call *s3call)
 {
-	const char *path = s3call->wbconn->listen_socket->service->priv_socket_path;
+	struct loadparm_context *lp_ctx = s3call->wbconn->listen_socket->service->task->lp_ctx;
+	const char *priv_socket_dir = lp_winbindd_privileged_socket_directory(lp_ctx);
+
 	s3call->response.result		 = WINBINDD_OK;
-	s3call->response.extra_data.data = discard_const(path);
+	s3call->response.extra_data.data = discard_const(priv_socket_dir);
 
-	s3call->response.length += strlen(path) + 1;
+	s3call->response.length += strlen(priv_socket_dir) + 1;
 	return NT_STATUS_OK;
 }
 
diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index 4b31997..9e1a187 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;
@@ -304,11 +304,9 @@ static void winbind_task_init(struct task_server *task)
 	listen_socket = talloc(service, struct wbsrv_listen_socket);
 	if (!listen_socket) goto nomem;
 	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;
+				  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 d86bc20..8b79bc7 100644
--- a/source4/winbind/wb_server.h
+++ b/source4/winbind/wb_server.h
@@ -24,10 +24,6 @@
 #include "winbind/idmap.h"
 #include "libnet/libnet.h"
 
-#define WINBINDD_SAMBA3_SOCKET "pipe"
-/* the privileged socket is in smbd_tmp_dir() */
-#define WINBINDD_SAMBA3_PRIVILEGED_SOCKET "winbind_pipe"
-
 /* this struct stores global data for the winbind task */
 struct wbsrv_service {
 	struct task_server *task;
@@ -35,8 +31,6 @@ 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 {


-- 
Samba Shared Repository