From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 12 Jun 2003 06:49:43 +0000 (-0400)
Subject: Merge
X-Git-Tag: NTP_4_1_80_RC1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed811aa04d141537f57d00ba0257e52772c1d71f;p=thirdparty%2Fntp.git

Merge

bk: 3ee82287ZNaGIU9LAVc_PJH_OjGzlg
---

ed811aa04d141537f57d00ba0257e52772c1d71f
diff --cc ntpd/ntp_io.c
index 74f086a7d,6b303fe58..28fd9e4e5
--- a/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;