Author: jra Date: 2007-05-31 17:26:30 +0000 (Thu, 31 May 2007) New Revision: 23272
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23272 Log: Fix main event loop - reviewed by Volker. Jeremy. Modified: branches/SAMBA_3_0/source/smbd/server.c branches/SAMBA_3_0_26/source/smbd/server.c Changeset: Modified: branches/SAMBA_3_0/source/smbd/server.c =================================================================== --- branches/SAMBA_3_0/source/smbd/server.c 2007-05-31 17:24:30 UTC (rev 23271) +++ branches/SAMBA_3_0/source/smbd/server.c 2007-05-31 17:26:30 UTC (rev 23272) @@ -418,8 +418,6 @@ 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 @@ 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 Modified: branches/SAMBA_3_0_26/source/smbd/server.c =================================================================== --- branches/SAMBA_3_0_26/source/smbd/server.c 2007-05-31 17:24:30 UTC (rev 23271) +++ branches/SAMBA_3_0_26/source/smbd/server.c 2007-05-31 17:26:30 UTC (rev 23272) @@ -516,8 +516,6 @@ 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); @@ -534,6 +532,10 @@ continue; } + if (run_events(smbd_event_context(), num, &r_fds, &w_fds)) { + continue; + } + /* check if we need to reload services */ check_reload(time(NULL));