From: Frank Kardel <kardel@ntp.org>
Date: Tue, 9 May 2006 09:56:16 +0000 (+0000)
Subject: ntpd.c:
X-Git-Tag: NTP_4_2_1P250_RC~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d43d7d07047f4761dea6cdc67baaf8c51ee5e735;p=thirdparty%2Fntp.git

ntpd.c:
  keep block/unblock calls balanced

bk: 44606740wdHnqCJOUcD5CSEcMsRCbg
---

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 99c8ddf77..43497ed44 100644
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -412,7 +412,6 @@ ntpdmain(
 	)
 {
 	l_fp now;
-	int tot_full_recvbufs;
 	struct recvbuf *rbuf;
 #ifdef _AIX			/* HMS: ifdef SIGDANGER? */
 	struct sigaction sa;
@@ -873,9 +872,12 @@ getgroup:
 #if defined(HAVE_IO_COMPLETION_PORT)
 
 	for (;;) {
-		tot_full_recvbufs = GetReceivedBuffers();
+		int tot_full_recvbufs = GetReceivedBuffers();
 #else /* normal I/O */
 
+#if defined(HAVE_SIGNALED_IO)
+	block_io_and_alarm();
+# endif
 	was_alarmed = 0;
 	for (;;)
 	{
@@ -885,8 +887,6 @@ getgroup:
 
 		fd_set rdfdes;
 		int nfound;
-# elif defined(HAVE_SIGNALED_IO)
-		block_io_and_alarm();
 # endif
 
 		if (alarm_flag) 	/* alarmed? */