From: Andrew Tridgell Date: Tue, 1 May 2007 20:50:12 +0000 (+1000) Subject: fixed a lib/events bug found by volker X-Git-Tag: tevent-0.9.20~348^2~2803 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a05ad1402c20df868abb2aeb56a6d9e3be1f884;p=thirdparty%2Fsamba.git fixed a lib/events bug found by volker (This used to be ctdb commit 46cd984500cd77d295f059132b4892dbfbc2bcd3) --- diff --git a/ctdb/lib/events/events_standard.c b/ctdb/lib/events/events_standard.c index 12595d8518c..dbb14246fd4 100644 --- a/ctdb/lib/events/events_standard.c +++ b/ctdb/lib/events/events_standard.c @@ -377,9 +377,10 @@ 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) { - std_ev->maxfd = fde->fd; - } + 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); epoll_add_event(std_ev, fde);