diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-05-02 06:50:12 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2007-05-02 06:50:12 +1000 |
| commit | 3a05ad1402c20df868abb2aeb56a6d9e3be1f884 (patch) | |
| tree | 4aaaac1ce0a1bc0647ae9095dd0a853668b410d4 | |
| parent | 2dc24c7d5645c0794369578db90b74fa03ef6d15 (diff) | |
| download | samba-3a05ad1402c20df868abb2aeb56a6d9e3be1f884.tar.gz samba-3a05ad1402c20df868abb2aeb56a6d9e3be1f884.tar.xz samba-3a05ad1402c20df868abb2aeb56a6d9e3be1f884.zip | |
fixed a lib/events bug found by volker
(This used to be ctdb commit 46cd984500cd77d295f059132b4892dbfbc2bcd3)
| -rw-r--r-- | ctdb/lib/events/events_standard.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ctdb/lib/events/events_standard.c b/ctdb/lib/events/events_standard.c index 12595d8518..dbb14246fd 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); |