summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-05-31 17:26:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:01 -0500
commit1a13bb5112dc51d6d7da801e9a7dd2655f067a6f (patch)
tree34d592305def570617a78675cee4b091e0af813e
parentd99f4f004ca46e4c0f2e60a231a14708a128f0f2 (diff)
downloadsamba-1a13bb5112dc51d6d7da801e9a7dd2655f067a6f.tar.gz
samba-1a13bb5112dc51d6d7da801e9a7dd2655f067a6f.tar.bz2
samba-1a13bb5112dc51d6d7da801e9a7dd2655f067a6f.zip
r23272: Fix main event loop - reviewed by Volker.
Jeremy. (This used to be commit dfb4cb5d2bd6c50ad2ecfa729d76daccfc43925a)
-rw-r--r--source3/smbd/server.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 8aa4e848a8..e95f3cf4a2 100644
--- a/source3/smbd/server.c
+++ b/source3/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