Merge

bk: 3ee82287ZNaGIU9LAVc_PJH_OjGzlg

diff --cc ntpd/ntp_io.c
index 74f086a7d904493708135a713fd2cf7331591960,6b303fe5855c16b44dbf1cfc018d43e29f350b4b..28fd9e4e5d503b5ab28ea9614c970c327087b1cb
--- 1/ntpd/ntp_io.c
--- 2/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@@ -1781,8 -1537,11 +1781,11 @@@ input_handler
                        /*
                         * extended FAU debugging output
                         */
-                       netsyslog(LOG_ERR, "select(%d, %s, 0L, 0L, &0.000000) error: %m",
-                               maxactivefd+1, fdbits(maxactivefd, &activefds));
+                       if (err != EINTR)
 -                          msyslog(LOG_ERR,
 -                                  "select(%d, %s, 0L, 0L, &0.0) error: %m",
 -                                  maxactivefd+1,
 -                                  fdbits(maxactivefd, &activefds));
++                          netsyslog(LOG_ERR,
++                                    "select(%d, %s, 0L, 0L, &0.0) error: %m",
++                                    maxactivefd+1,
++                                    fdbits(maxactivefd, &activefds));
                        if (err == EBADF) {
                                int j, b;