summaryrefslogtreecommitdiff
path: root/source4/lib/socket/socket_ipv4.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-17 05:07:07 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:57 -0500
commitf42402da83afa97f821d36b7974de98ddd5a2880 (patch)
treefe2541947382d29a45ae38bf8a93e349fbe74323 /source4/lib/socket/socket_ipv4.c
parentfef617c31bd4a8be09449d6bc726c729ae758423 (diff)
downloadsamba-f42402da83afa97f821d36b7974de98ddd5a2880.tar.gz
samba-f42402da83afa97f821d36b7974de98ddd5a2880.tar.bz2
samba-f42402da83afa97f821d36b7974de98ddd5a2880.zip
r3013: added support for unix domain sockets in the generic socket library. I
will shortly be using this for a rewrite of the intra-smbd messaging library, which is needed to get lock timeouts working properly (and share modes, oplocks etc) (This used to be commit 6f4926d846965a901e40d24546eab356c4a537c7)
Diffstat (limited to 'source4/lib/socket/socket_ipv4.c')
-rw-r--r--source4/lib/socket/socket_ipv4.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/socket/socket_ipv4.c b/source4/lib/socket/socket_ipv4.c
index 88bf611b67..23e34dd39b 100644
--- a/source4/lib/socket/socket_ipv4.c
+++ b/source4/lib/socket/socket_ipv4.c
@@ -150,7 +150,7 @@ static NTSTATUS ipv4_tcp_listen(struct socket_context *sock,
static NTSTATUS ipv4_tcp_accept(struct socket_context *sock, struct socket_context **new_sock, uint32_t flags)
{
struct sockaddr_in cli_addr;
- socklen_t cli_addr_len = 0;
+ socklen_t cli_addr_len = sizeof(cli_addr);
int new_fd;
new_fd = accept(sock->fd, (struct sockaddr *)&cli_addr, &cli_addr_len);
@@ -167,6 +167,7 @@ static NTSTATUS ipv4_tcp_accept(struct socket_context *sock, struct socket_conte
(*new_sock) = talloc_p(NULL, struct socket_context);
if (!(*new_sock)) {
+ close(new_fd);
return NT_STATUS_NO_MEMORY;
}