From 34cd0662f0340720fa45dd16c82496cd76e92268 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 28 Oct 2004 07:34:11 +0000 Subject: r3313: in socket_accept() make the new socket non-blocking unless SOCKET_FLAG_BLOCK is set. (This used to be commit a2d92aa431e0e9752387eebe741d9e6f376f74d7) --- source4/lib/socket/socket_unix.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source4/lib/socket/socket_unix.c') diff --git a/source4/lib/socket/socket_unix.c b/source4/lib/socket/socket_unix.c index 3a3ce5fe8a..239e4eb069 100644 --- a/source4/lib/socket/socket_unix.c +++ b/source4/lib/socket/socket_unix.c @@ -136,6 +136,14 @@ static NTSTATUS unixdom_accept(struct socket_context *sock, return unixdom_error(errno); } + if (!(flags & SOCKET_FLAG_BLOCK)) { + int ret = set_blocking(new_fd, False); + if (ret == -1) { + close(new_fd); + return map_nt_error_from_unix(errno); + } + } + (*new_sock) = talloc_p(NULL, struct socket_context); if (!(*new_sock)) { close(new_fd); -- cgit