summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-09-20 13:17:51 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:54 -0500
commit65c3b46d0222df9c1bb49416a632913b4906b391 (patch)
treeeb2f1e0871147d4b19e9620f074448a024d45e88
parent03cf36ac9c7ed1f3b8d771b8a795c97ec856b55c (diff)
downloadsamba-65c3b46d0222df9c1bb49416a632913b4906b391.tar.gz
samba-65c3b46d0222df9c1bb49416a632913b4906b391.tar.bz2
samba-65c3b46d0222df9c1bb49416a632913b4906b391.zip
r2449: use a blocking fd for smbsrv code
metze (This used to be commit fba1637710138b0f2fae148e88b91a9cd1665465)
-rw-r--r--source4/smb_server/smb_server.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index 516babf4b7..13c0a9770f 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -825,6 +825,7 @@ void smbsrv_accept(struct server_connection *conn)
{
struct smbsrv_connection *smb_conn;
char *socket_addr;
+ int fd;
DEBUG(5,("smbsrv_accept\n"));
@@ -863,6 +864,9 @@ void smbsrv_accept(struct server_connection *conn)
conn->private_data = smb_conn;
+ fd = socket_get_fd(conn->socket);
+ set_blocking(fd, True);
+
/* setup the DCERPC server subsystem */
dcesrv_init_context(&smb_conn->dcesrv);