The branch, master has been updated
via 020032e s3:lib/events: Fix a bug in run_poll_events().
from abd2e25 talloc: prepare for 2.0.6 release
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 020032e114c0e966acf24f24e707942219d60cf3
Author: Stefan Metzmacher <[email protected]>
Date: Mon Aug 8 18:49:06 2011 +0200
s3:lib/events: Fix a bug in run_poll_events().
Ignore fd events without EVENT_FD_READ or EVENT_FD_WRITE also in
run_events_poll(). They are ignore when building the array
for the syscall in event_add_to_poll_args(), so we need to
ignore them run_events_poll() too.
metze
Signed-off-by: Andreas Schneider <[email protected]>
Autobuild-User: Stefan Metzmacher <[email protected]>
Autobuild-Date: Tue Aug 9 10:11:54 CEST 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/lib/events.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/events.c b/source3/lib/events.c
index b0d3ce5..77589f8 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -243,6 +243,10 @@ bool run_events_poll(struct tevent_context *ev, int
pollrtn,
struct pollfd *pfd;
uint16 flags = 0;
+ if ((fde->flags & (EVENT_FD_READ|EVENT_FD_WRITE)) == 0) {
+ continue;
+ }
+
if (pollfd_idx[fde->fd] >= num_pfds) {
DEBUG(1, ("internal error: pollfd_idx[fde->fd] (%d) "
">= num_pfds (%d)\n", pollfd_idx[fde->fd],
--
Samba Shared Repository
