[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  fbf3d03 s3: Fix an uninitialized variable
       via  f687d43 s3: Fix the build without cluster
      from  e466bb4 s3: Remove smbd_server_fd()

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


- Log -----------------------------------------------------------------
commit fbf3d03550495df58adeb291a44776270d6cf01d
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Aug 29 23:13:46 2010 +0200

    s3: Fix an uninitialized variable

commit f687d43454cfc3bd293adfbb942358794c780b56
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Aug 29 23:13:34 2010 +0200

    s3: Fix the build without cluster

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

Summary of changes:
 source3/smbd/process.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 51b2e51..6beed4f 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2889,6 +2889,8 @@ fail:
 	return false;
 }
 
+#if CLUSTER_SUPPORT
+
 static NTSTATUS smbd_register_ips(struct smbd_server_connection *sconn,
 				  struct sockaddr_storage *srv,
 				  struct sockaddr_storage *clnt)
@@ -2902,7 +2904,7 @@ static NTSTATUS smbd_register_ips(struct smbd_server_connection *sconn,
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	client_socket_addr(sconn->sock, addr, sizeof(addr));
+	client_socket_addr(sconn->sock, tmp_addr, sizeof(tmp_addr));
 	addr = talloc_strdup(cconn, tmp_addr);
 	if (addr == NULL) {
 		return NT_STATUS_NO_MEMORY;
@@ -2910,6 +2912,8 @@ static NTSTATUS smbd_register_ips(struct smbd_server_connection *sconn,
 	return ctdbd_register_ips(cconn, srv, clnt, release_ip, addr);
 }
 
+#endif
+
 /****************************************************************************
  Process commands from the client
 ****************************************************************************/


-- 
Samba Shared Repository