git.samba.org
/
abartlet
/
samba.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d99f4f0
)
r23272: Fix main event loop - reviewed by Volker.
author
Jeremy Allison
<jra@samba.org>
Thu, 31 May 2007 17:26:30 +0000
(17:26 +0000)
committer
Gerald (Jerry) Carter
<jerry@samba.org>
Wed, 10 Oct 2007 17:23:01 +0000
(12:23 -0500)
Jeremy.
(This used to be commit
dfb4cb5d2bd6c50ad2ecfa729d76daccfc43925a
)
source3/smbd/server.c
patch
|
blob
|
history
diff --git
a/source3/smbd/server.c
b/source3/smbd/server.c
index 8aa4e848a84a2b2b1e994d3d5841858429e8200e..e95f3cf4a2b803c8a30fd5c1a77cb0d91b32a754 100644
(file)
--- 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