From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 5 Jan 2009 10:53:29 +0000 (+0100)
Subject: s3:winbindd: also handle fd events from the winbind_event_context()
X-Git-Tag: samba-4.0.0alpha6~280^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59612beea63f5017d0e3c0370ce1e6ad22275901;p=thirdparty%2Fsamba.git

s3:winbindd: also handle fd events from the winbind_event_context()

metze
---

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index d06285b791b..cf1dbf6f726 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;