From 20a0206a102694a1eae7be73be6ae91ff7f6abce Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 1 May 2007 20:57:54 +0000
Subject: r22632: merged volkers select events fix (This used to be commit
 216aa06fe634f98dce3f157e67303e90ddb70e2d)

---
 source4/lib/events/events_standard.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/lib/events/events_standard.c')

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);
-- 
cgit