summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-01-05 11:53:29 +0100
committerStefan Metzmacher <metze@samba.org>2009-01-05 15:07:36 +0100
commit59612beea63f5017d0e3c0370ce1e6ad22275901 (patch)
tree828421e636175827f8042660f71b62c98a6594d8 /source3
parent303c57ef785a6189b16d879cf719998f17ab097a (diff)
downloadsamba-59612beea63f5017d0e3c0370ce1e6ad22275901.tar.gz
samba-59612beea63f5017d0e3c0370ce1e6ad22275901.tar.bz2
samba-59612beea63f5017d0e3c0370ce1e6ad22275901.zip
s3:winbindd: also handle fd events from the winbind_event_context()
metze
Diffstat (limited to 'source3')
-rw-r--r--source3/winbindd/winbindd.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index d06285b791..cf1dbf6f72 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -865,6 +865,13 @@ static void process_loop(void)
timeout.tv_usec = 0;
/* Check for any event timeouts. */
+ {
+ struct timeval now;
+ GetTimeOfDay(&now);
+
+ event_add_to_select_args(winbind_event_context(), &now,
+ &r_fds, &w_fds, &ev_timeout, &maxfd);
+ }
if (get_timed_events_timeout(winbind_event_context(), &ev_timeout)) {
timeout = timeval_min(&timeout, &ev_timeout);
}
@@ -918,6 +925,8 @@ static void process_loop(void)
/* selret > 0 */
+ run_events(winbind_event_context(), selret, &r_fds, &w_fds);
+
ev = fd_events;
while (ev != NULL) {
struct winbindd_fd_event *next = ev->next;