summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-08-28 08:27:08 +0200
committerStefan Metzmacher <metze@samba.org>2010-08-28 08:28:01 +0200
commitdb6d1c6276e1435e92e190ee9a80de55ca28561d (patch)
tree9d14648cdf64c2e949f5824b751bcf2db28c9955 /source3/smbd
parent8494d09b894f65b1f948c47710137946075bcfec (diff)
downloadsamba-db6d1c6276e1435e92e190ee9a80de55ca28561d.tar.gz
samba-db6d1c6276e1435e92e190ee9a80de55ca28561d.tar.bz2
samba-db6d1c6276e1435e92e190ee9a80de55ca28561d.zip
s3:smbd: s/sa_len/sa_socklen , because sa_len is a macro on IRIX
metze
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/process.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 961598f8fd..a18f04521f 100644
--- 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",