Browse Source

Check for error status from poll() too; ok henning@

OPENBSD_3_7
dtucker 20 years ago
parent
commit
9cb603051f
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      src/usr.sbin/ntpd/ntp.c

+ 4
- 4
src/usr.sbin/ntpd/ntp.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: ntp.c,v 1.42 2004/11/12 17:24:52 henning Exp $ */
/* $OpenBSD: ntp.c,v 1.43 2004/12/13 12:36:02 dtucker Exp $ */
/* /*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -233,21 +233,21 @@ ntp_main(int pipe_prnt[2], struct ntpd_conf *nconf)
ntp_quit = 1; ntp_quit = 1;
} }
if (nfds > 0 && pfd[PFD_PIPE_MAIN].revents & POLLIN) {
if (nfds > 0 && pfd[PFD_PIPE_MAIN].revents & (POLLIN|POLLERR)) {
nfds--; nfds--;
if (ntp_dispatch_imsg() == -1) if (ntp_dispatch_imsg() == -1)
ntp_quit = 1; ntp_quit = 1;
} }
for (j = 1; nfds > 0 && j < idx_peers; j++) for (j = 1; nfds > 0 && j < idx_peers; j++)
if (pfd[j].revents & POLLIN) {
if (pfd[j].revents & (POLLIN|POLLERR)) {
nfds--; nfds--;
if (server_dispatch(pfd[j].fd, conf) == -1) if (server_dispatch(pfd[j].fd, conf) == -1)
ntp_quit = 1; ntp_quit = 1;
} }
for (; nfds > 0 && j < i; j++) for (; nfds > 0 && j < i; j++)
if (pfd[j].revents & POLLIN) {
if (pfd[j].revents & (POLLIN|POLLERR)) {
nfds--; nfds--;
if (client_dispatch(idx2peer[j - idx_peers], if (client_dispatch(idx2peer[j - idx_peers],
conf->settime) == -1) conf->settime) == -1)


Loading…
Cancel
Save