ntp_io.c:

  Make MAXZEROREADS 1

bk: 421972e1hpPR_NoFCTdRjiWzaLRMqw

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 78bd704984793bdebcea889c0043869a9f8c46f1..4f3486a8af8c31b6e6aff7b472960bcc25488b0b 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -1891,7 +1891,7 @@ input_handler(
                                                char buf[RX_BUFF_SIZE];
 
                                                buflen = read(fd, buf, sizeof buf);
-                                               if (buflen < 0)
+                                               if (buflen <= 0)
                                                        break;  /* Done */
                                                packets_dropped++;
                                                if (buflen == 0)
@@ -1912,10 +1912,10 @@ input_handler(
                                        if (buflen < 0)
                                        {
                                                freerecvbuf(rb);
-                                               if (errno != EINTR) {
-                                                       netsyslog(LOG_ERR, "clock read fd %d, bytes read %d: %m", fd, rb->recv_length);
-                                                       break;
+                                               if (errno != EINTR && errno != EAGAIN) {
+                                                       netsyslog(LOG_ERR, "clock read fd %d: %m", fd);
                                                }
+                                               break;
                                        }
                                        if(buflen == 0)
                                                totzeroreads++;