From 048f8dba141c2f9898aad67e09925f03394a946e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 20 Jan 2009 04:14:20 +0100
Subject: s3: always call run_events() before and after sys_select()

And always setup the fd events.

metze
---
 source3/smbd/process.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'source3/smbd/process.c')

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 44cacfafdd..7847505f7c 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -818,13 +818,11 @@ static NTSTATUS smbd_server_connection_loop_once(struct smbd_server_connection *
 					 &r_fds, &w_fds, &to, &maxfd);
 	}
 
-	if (timeval_is_zero(&to)) {
-		/* Process a timed event now... */
-		if (run_events(smbd_event_context(), 0, NULL, NULL)) {
-			return NT_STATUS_RETRY;
-		}
+	/* Process a signal and timed events now... */
+	if (run_events(smbd_event_context(), 0, NULL, NULL)) {
+		return NT_STATUS_RETRY;
 	}
-	
+
 	{
 		int sav;
 		START_PROFILE(smbd_idle);
-- 
cgit