s3:smbd: s/sa_len/sa_socklen , because sa_len is a macro on IRIX

metze

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 961598f8fd79ffafb6051fed29e33a9ff51684ae..a18f04521fc76524723e417f5504ef6c2bc9025f 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2897,7 +2897,7 @@ void smbd_process(struct smbd_server_connection *sconn)
        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;
@@ -2923,15 +2923,15 @@ void smbd_process(struct smbd_server_connection *sconn)
        set_socket_options(sconn->sock, lp_socket_options());
 
        sa = (struct sockaddr *)(void *)&ss;
-       sa_len = sizeof(ss);
-       ret = getpeername(sconn->sock, sa, &sa_len);
+       sa_socklen = sizeof(ss);
+       ret = getpeername(sconn->sock, 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(sconn,
-                                               sa, sa_len,
+                                               sa, sa_socklen,
                                                &remote_address);
        if (ret != 0) {
                DEBUG(0,("%s: tsocket_address_bsd_from_sockaddr remote failed - %s\n",
@@ -2940,15 +2940,15 @@ void smbd_process(struct smbd_server_connection *sconn)
        }
 
        sa = (struct sockaddr *)(void *)&ss;
-       sa_len = sizeof(ss);
-       ret = getsockname(sconn->sock, sa, &sa_len);
+       sa_socklen = sizeof(ss);
+       ret = getsockname(sconn->sock, 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(sconn,
-                                               sa, sa_len,
+                                               sa, sa_socklen,
                                                &local_address);
        if (ret != 0) {
                DEBUG(0,("%s: tsocket_address_bsd_from_sockaddr remote failed - %s\n",