From: Volker Lendecke <vl@samba.org>
Date: Wed, 7 Oct 2009 13:53:46 +0000 (+0200)
Subject: s3:winbind: Only ever handle one event after a select call
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4df4406f12281db60fd6612c6ebf93d77af9152;p=thirdparty%2Fsamba.git

s3:winbind: Only ever handle one event after a select call

While handling an fd event, the situation with other fds can change. I've just
seen a winbind stuck in the accept() call on the privileged pipe. I can only
imagine this happen because under high load we first handled other requests and
meanwhile the client on the privileged pipe went away.
---

diff --git a/source/winbindd/winbindd.c b/source/winbindd/winbindd.c
index 9005e6754d9..1d618e26317 100644
--- a/source/winbindd/winbindd.c
+++ b/source/winbindd/winbindd.c
@@ -847,7 +847,9 @@ static void process_loop(void)
 
 	message_dispatch(winbind_messaging_context());
 
-	run_events(winbind_event_context(), 0, NULL, NULL);
+	if (run_events(winbind_event_context(), 0, NULL, NULL)) {
+		return;
+	}
 
 	/* refresh the trusted domain cache */
 
@@ -927,8 +929,10 @@ static void process_loop(void)
 			flags |= EVENT_FD_READ;
 		if (FD_ISSET(ev->fd, &w_fds))
 			flags |= EVENT_FD_WRITE;
-		if (flags)
+		if (flags) {
 			ev->handler(ev, flags);
+			return;
+		}
 		ev = next;
 	}