diff options
| author | Jeremy Allison <jra@samba.org> | 2006-05-18 19:49:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:17:08 -0500 |
| commit | 0648638fef56a65f9389c8a98f66c57663e8c401 (patch) | |
| tree | 236a1c2aeb0fa8fe2d4b3913e62c222c96124130 /source3/nmbd/nmbd_subnetdb.c | |
| parent | c60e96c392df858dd22d39d27513486c5c18c3d2 (diff) | |
| download | samba-0648638fef56a65f9389c8a98f66c57663e8c401.tar.gz samba-0648638fef56a65f9389c8a98f66c57663e8c401.tar.bz2 samba-0648638fef56a65f9389c8a98f66c57663e8c401.zip | |
r15700: Make nmbd udp sockets non-blocking to prevent problem
with select returning true but no data being available.
Fix for bug #3779.
Jeremy.
(This used to be commit e5787cf75b2e7d50f551f34f28d280c27b0aa134)
Diffstat (limited to 'source3/nmbd/nmbd_subnetdb.c')
| -rw-r--r-- | source3/nmbd/nmbd_subnetdb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/nmbd/nmbd_subnetdb.c b/source3/nmbd/nmbd_subnetdb.c index b2e1178beb..c3640028d2 100644 --- a/source3/nmbd/nmbd_subnetdb.c +++ b/source3/nmbd/nmbd_subnetdb.c @@ -26,8 +26,6 @@ #include "includes.h" extern struct in_addr loopback_ip; -extern int ClientNMB; -extern int ClientDGRAM; extern int global_nmb_port; /* This is the broadcast subnets database. */ @@ -118,6 +116,10 @@ static struct subnet_record *make_subnet(const char *name, enum subnet_type type /* Make sure we can broadcast from these sockets. */ set_socket_options(nmb_sock,"SO_BROADCAST"); set_socket_options(dgram_sock,"SO_BROADCAST"); + + /* Set them non-blocking. */ + set_blocking(nmb_sock, False); + set_blocking(dgram_sock, False); } subrec = SMB_MALLOC_P(struct subnet_record); |