From dfb4cb5d2bd6c50ad2ecfa729d76daccfc43925a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 31 May 2007 17:26:30 +0000 Subject: [PATCH 1/1] r23272: Fix main event loop - reviewed by Volker. Jeremy. --- source/smbd/server.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/smbd/server.c b/source/smbd/server.c index 8aa4e848a84..e95f3cf4a2b 100644 --- a/source/smbd/server.c +++ b/source/smbd/server.c @@ -418,8 +418,6 @@ static BOOL open_sockets_smbd(enum smb_server_mode server_mode, const char *smb_ timeval_is_zero(&idle_timeout) ? NULL : &idle_timeout); - run_events(smbd_event_context(), num, &r_fds, &w_fds); - if (num == -1 && errno == EINTR) { if (got_sig_term) { exit_server_cleanly(NULL); @@ -436,6 +434,10 @@ static BOOL open_sockets_smbd(enum smb_server_mode server_mode, const char *smb_ continue; } + if (run_events(smbd_event_context(), num, &r_fds, &w_fds)) { + continue; + } + #if 0 Deactivated for now, this needs to become a timed event vl -- 2.34.1