[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-497-ged26195

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  ed26195d0eda6dd1ca14508cfd31a48dde79d44f (commit)
       via  2209787812fd9224d104f332e25d8ce64ef9ee95 (commit)
      from  6ad94d10f79f206fcdeb23cf71595e38c7a77855 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit ed26195d0eda6dd1ca14508cfd31a48dde79d44f
Merge: 2209787812fd9224d104f332e25d8ce64ef9ee95 6ad94d10f79f206fcdeb23cf71595e38c7a77855
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Sep 10 14:09:07 2008 +1000

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

commit 2209787812fd9224d104f332e25d8ce64ef9ee95
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Sep 10 14:08:40 2008 +1000

    Return the same privilaged winbindd socket as we actually use.
    
    Andrew Bartlett

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

Summary of changes:
 source/winbind/wb_samba3_cmd.c |    3 +--
 source/winbind/wb_server.c     |    4 +++-
 source/winbind/wb_server.h     |    2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbind/wb_samba3_cmd.c b/source/winbind/wb_samba3_cmd.c
index 5ef0339..c2ba55f 100644
--- a/source/winbind/wb_samba3_cmd.c
+++ b/source/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/source/winbind/wb_server.c b/source/winbind/wb_server.c
index 97646f2..d56a82e 100644
--- a/source/winbind/wb_server.c
+++ b/source/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/source/winbind/wb_server.h b/source/winbind/wb_server.h
index 5a7ba7b..97d7d81 100644
--- a/source/winbind/wb_server.h
+++ b/source/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 {


-- 
Samba Shared Repository