Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2015-12-05 14:01:09 +00:00
commit 8ae9329aa8

3
proc.c
View File

@ -59,7 +59,8 @@ proc_event_cb(__unused int fd, short events, void *arg)
struct imsg imsg; struct imsg imsg;
if (!(peer->flags & PEER_BAD) && (events & EV_READ)) { if (!(peer->flags & PEER_BAD) && (events & EV_READ)) {
if ((n = imsg_read(&peer->ibuf)) == -1 || n == 0) { if (((n = imsg_read(&peer->ibuf)) == -1 && errno != EAGAIN) ||
n == 0) {
peer->dispatchcb(NULL, peer->arg); peer->dispatchcb(NULL, peer->arg);
return; return;
} }