summaryrefslogtreecommitdiff
path: root/source3/winbindd
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/winbindd
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/winbindd')
-rw-r--r--source3/winbindd/winbindd_dual.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index a32459d595..ac50a5637a 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -1418,7 +1418,7 @@ static bool fork_domain_child(struct winbindd_child *child)
while (1) {
- int ret = 0;
+ int ret;
fd_set r_fds;
fd_set w_fds;
int maxfd;
@@ -1429,7 +1429,7 @@ static bool fork_domain_child(struct winbindd_child *child)
int iov_count;
NTSTATUS status;
- if (run_events(winbind_event_context(), &ret, NULL, NULL)) {
+ if (run_events(winbind_event_context(), 0, NULL, NULL)) {
TALLOC_FREE(frame);
continue;
}
@@ -1465,7 +1465,7 @@ static bool fork_domain_child(struct winbindd_child *child)
ret = sys_select(maxfd + 1, &r_fds, &w_fds, NULL, tp);
- if (run_events(winbind_event_context(), &ret, &r_fds, &w_fds)) {
+ if (run_events(winbind_event_context(), ret, &r_fds, &w_fds)) {
/* We got a signal - continue. */
TALLOC_FREE(frame);
continue;