summaryrefslogtreecommitdiff
path: root/source3/nmbd
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-01-24 08:47:38 +0100
committerStefan Metzmacher <metze@samba.org>2011-01-31 16:16:09 +0100
commit19d3779274314bb4ce76e3afaa21cf37de7b2b98 (patch)
treeb7063d6abd080fd0fefa8cb7f07822fb06f4d2e5 /source3/nmbd
parent1537f5dab1d947fddee05b27c7feb5c7e83e83a2 (diff)
downloadsamba-19d3779274314bb4ce76e3afaa21cf37de7b2b98.tar.gz
samba-19d3779274314bb4ce76e3afaa21cf37de7b2b98.tar.bz2
samba-19d3779274314bb4ce76e3afaa21cf37de7b2b98.zip
Revert "s3:events: Call all ready fd event handlers on each iteration of the main loop"
This reverts commit 455fccf86b6544cd17a2571c63a88f8aebff3f74. I'll add a more generic fix for this problem. metze
Diffstat (limited to 'source3/nmbd')
-rw-r--r--source3/nmbd/nmbd_packets.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index 73ee141104..48d10cc26d 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -1857,7 +1857,7 @@ bool listen_for_packets(bool run_election)
fd_set r_fds;
fd_set w_fds;
- int selrtn = 0;
+ int selrtn;
struct timeval timeout;
#ifndef SYNC_DNS
int dns_fd;
@@ -1884,7 +1884,7 @@ bool listen_for_packets(bool run_election)
#endif
/* Process a signal and timer events now... */
- if (run_events(nmbd_event_context(), &selrtn, NULL, NULL)) {
+ if (run_events(nmbd_event_context(), 0, NULL, NULL)) {
return False;
}
@@ -1903,7 +1903,7 @@ bool listen_for_packets(bool run_election)
selrtn = sys_select(maxfd+1,&r_fds,&w_fds,NULL,&timeout);
- if (run_events(nmbd_event_context(), &selrtn, &r_fds, &w_fds)) {
+ if (run_events(nmbd_event_context(), selrtn, &r_fds, &w_fds)) {
return False;
}