From 3f7bb704a9e62e7a46a05838ec9300c2f6916c16 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 23 May 2006 15:21:55 +0000
Subject: r15837: starting sync up for 3.0.23rc1 (in sync with SAMBA_3_0
 r15822)

---
 source/nmbd/nmbd.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source/nmbd/nmbd.c')

diff --git a/source/nmbd/nmbd.c b/source/nmbd/nmbd.c
index fca17d1ff7b..9c8f99df252 100644
--- a/source/nmbd/nmbd.c
+++ b/source/nmbd/nmbd.c
@@ -605,6 +605,10 @@ static BOOL open_sockets(BOOL isdaemon, int port)
 	set_socket_options( ClientNMB,   "SO_BROADCAST" );
 	set_socket_options( ClientDGRAM, "SO_BROADCAST" );
 
+	/* Ensure we're non-blocking. */
+	set_blocking( ClientNMB, False);
+	set_blocking( ClientDGRAM, False);
+
 	DEBUG( 3, ( "open_sockets: Broadcast sockets opened.\n" ) );
 	return( True );
 }
-- 
cgit