diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-12-09 17:49:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:14 -0500 |
| commit | 2b589a76912c36ad80e650508b0b386e6d1d6070 (patch) | |
| tree | 5da170964f3390570d1ad20b502924ff7e79fecf /source4 | |
| parent | 040fc5aef51a8dcffcae88b780ee334f526752e1 (diff) | |
| download | samba-2b589a76912c36ad80e650508b0b386e6d1d6070.tar.gz samba-2b589a76912c36ad80e650508b0b386e6d1d6070.tar.bz2 samba-2b589a76912c36ad80e650508b0b386e6d1d6070.zip | |
r12146: as epoll notifies EPOLLERR and EPOLLHUP implicit,
let our code make it explicit, to make it clear
metze
(This used to be commit cf733e2684ab0d43d83b1ab5c9d178d895f768a1)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/events/events_standard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/events/events_standard.c b/source4/lib/events/events_standard.c index bd06cbfe96..abf17dd710 100644 --- a/source4/lib/events/events_standard.c +++ b/source4/lib/events/events_standard.c @@ -92,8 +92,8 @@ static void epoll_fallback_to_select(struct std_event_context *std_ev, const cha static uint32_t epoll_map_flags(uint16_t flags) { uint32_t ret = 0; - if (flags & EVENT_FD_READ) ret |= EPOLLIN; - if (flags & EVENT_FD_WRITE) ret |= EPOLLOUT; + if (flags & EVENT_FD_READ) ret |= (EPOLLIN | EPOLLERR | EPOLLHUP); + if (flags & EVENT_FD_WRITE) ret |= (EPOLLOUT | EPOLLERR | EPOLLHUP); return ret; } |