summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2007-05-01 20:57:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:56 -0500
commit20a0206a102694a1eae7be73be6ae91ff7f6abce (patch)
tree46f6993189f4ff8dd798c988741a95157d79ad8a /source4
parentde9768764d08e954cd000a04e9646a828917d876 (diff)
downloadsamba-20a0206a102694a1eae7be73be6ae91ff7f6abce.tar.gz
samba-20a0206a102694a1eae7be73be6ae91ff7f6abce.tar.bz2
samba-20a0206a102694a1eae7be73be6ae91ff7f6abce.zip
r22632: merged volkers select events fix
(This used to be commit 216aa06fe634f98dce3f157e67303e90ddb70e2d)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/events/events_standard.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/events/events_standard.c b/source4/lib/events/events_standard.c
index 48959526c0..3b26b1073d 100644
--- a/source4/lib/events/events_standard.c
+++ b/source4/lib/events/events_standard.c
@@ -380,7 +380,8 @@ static struct fd_event *std_event_add_fd(struct event_context *ev, TALLOC_CTX *m
fde->additional_data = NULL;
DLIST_ADD(std_ev->fd_events, fde);
- if (fde->fd > std_ev->maxfd) {
+ if ((std_ev->maxfd != EVENT_INVALID_MAXFD)
+ && (fde->fd > std_ev->maxfd)) {
std_ev->maxfd = fde->fd;
}
talloc_set_destructor(fde, std_event_fd_destructor);