[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  e310810 s3:smbd: s/sa_len/sa_socklen , because sa_len is a macro on IRIX
      from  6d4dead Fix bug #7653 - When SMB2 is on, Windows 7 clients can not connect as guest to a share.

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


- Log -----------------------------------------------------------------
commit e3108101fa38a9f97c440e8d4b698949e88d2b53
Author: Jeremy Allison <jra at samba.org>
Date:   Sun Aug 29 15:39:15 2010 -0700

    s3:smbd: s/sa_len/sa_socklen , because sa_len is a macro on IRIX
    
    (Originally from Metze's db6d1c6276e1435e92e190ee9a80de55ca28561d
    commit in master). Modified for 3.6.x.
    
    Jeremy.

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

Summary of changes:
 source3/modules/perfcount_onefs.c |   10 +++++-----
 source3/smbd/process.c            |   14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/perfcount_onefs.c b/source3/modules/perfcount_onefs.c
index 75dc145..2cad410 100644
--- a/source3/modules/perfcount_onefs.c
+++ b/source3/modules/perfcount_onefs.c
@@ -303,18 +303,18 @@ static void onefs_smb_statistics_end(struct smb_perfcount_data *pcd)
 	/* get address info once, doesn't change for process */
 	if (rem_addr == 0) {
 		struct sockaddr_storage sa;
-		socklen_t sa_len;
+		socklen_t sa_socklen;
 		int fd = smbd_server_fd();
 
-		sa_len = sizeof sa;
-		if (getpeername(fd, (struct sockaddr *)&sa, &sa_len) == 0 && 
+		sa_socklen = sizeof sa;
+		if (getpeername(fd, (struct sockaddr *)&sa, &sa_socklen) == 0 && 
 		    sa.ss_family == AF_INET)
 			rem_addr = ((struct sockaddr_in *)&sa)->sin_addr.s_addr;
 		else
 			rem_addr = ISC_MASKED_ADDR;
 
-		sa_len = sizeof sa;
-		if (getsockname(fd, (struct sockaddr *)&sa, &sa_len) == 0 &&
+		sa_socklen = sizeof sa;
+		if (getsockname(fd, (struct sockaddr *)&sa, &sa_socklen) == 0 &&
 		    sa.ss_family == AF_INET)
 			loc_addr = ((struct sockaddr_in *)&sa)->sin_addr.s_addr;
 		else
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 9ec3faf..73caa5f 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2879,7 +2879,7 @@ void smbd_process(void)
 	TALLOC_CTX *frame = talloc_stackframe();
 	struct sockaddr_storage ss;
 	struct sockaddr *sa = NULL;
-	socklen_t sa_len;
+	socklen_t sa_socklen;
 	struct tsocket_address *local_address = NULL;
 	struct tsocket_address *remote_address = NULL;
 	const char *remaddr = NULL;
@@ -2906,15 +2906,15 @@ void smbd_process(void)
 	set_socket_options(smbd_server_fd(), lp_socket_options());
 
 	sa = (struct sockaddr *)(void *)&ss;
-	sa_len = sizeof(ss);
-	ret = getpeername(smbd_server_fd(), sa, &sa_len);
+	sa_socklen = sizeof(ss);
+	ret = getpeername(smbd_server_fd(), sa, &sa_socklen);
 	if (ret != 0) {
 		int level = (errno == ENOTCONN)?2:0;
 		DEBUG(level,("getpeername() failed - %s\n", strerror(errno)));
 		exit_server_cleanly("getpeername() failed.\n");
 	}
 	ret = tsocket_address_bsd_from_sockaddr(smbd_server_conn,
-						sa, sa_len,
+						sa, sa_socklen,
 						&remote_address);
 	if (ret != 0) {
 		DEBUG(0,("%s: tsocket_address_bsd_from_sockaddr remote failed - %s\n",
@@ -2923,15 +2923,15 @@ void smbd_process(void)
 	}
 
 	sa = (struct sockaddr *)(void *)&ss;
-	sa_len = sizeof(ss);
-	ret = getsockname(smbd_server_fd(), sa, &sa_len);
+	sa_socklen = sizeof(ss);
+	ret = getsockname(smbd_server_fd(), sa, &sa_socklen);
 	if (ret != 0) {
 		int level = (errno == ENOTCONN)?2:0;
 		DEBUG(level,("getsockname() failed - %s\n", strerror(errno)));
 		exit_server_cleanly("getsockname() failed.\n");
 	}
 	ret = tsocket_address_bsd_from_sockaddr(smbd_server_conn,
-						sa, sa_len,
+						sa, sa_socklen,
 						&local_address);
 	if (ret != 0) {
 		DEBUG(0,("%s: tsocket_address_bsd_from_sockaddr remote failed - %s\n",


-- 
Samba Shared Repository