From: John Hay <hay@ntp.org>
Date: Sat, 10 Nov 2001 11:32:50 +0000 (+0200)
Subject: Make ntpdate also compile and run on rackety (SunOS 4.1.3)
X-Git-Tag: NTP_4_1_73~234
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5992e52a84cf7d8bf7ef9f3566cc3d2eba30bf88;p=thirdparty%2Fntp.git

Make ntpdate also compile and run on rackety (SunOS 4.1.3)
Catch a if(... = ...).

bk: 3bed1062R0HMriKL7BD0ZQtdGEJM-A
---

diff --git a/ntpdate/ntpdate.c b/ntpdate/ntpdate.c
index 97637d1356..48bdefa157 100644
--- a/ntpdate/ntpdate.c
+++ b/ntpdate/ntpdate.c
@@ -659,7 +659,8 @@ ntpdatemain (
 	return clock_adjust();
 }
 
-void stop_timer(void)
+static void
+stop_timer(void)
 {
         struct itimerval itimer;
 
@@ -1668,7 +1669,7 @@ init_io(void)
     	   }
 #ifdef IPV6_V6ONLY
            /* Restricts AF_INET6 socket to IPv6 communications (see RFC 2553bis-03) */
-           if(res->ai_family = AF_INET6)
+           if (res->ai_family == AF_INET6)
                 if (setsockopt(fd[nbsock], IPPROTO_IPV6, IPV6_V6ONLY, (void*) &optval, sizeof(optval)) < 0) {
    		           msyslog(LOG_ERR, "setsockopt() IPV6_V6ONLY failed: %m");
    		           exit(1);
@@ -1821,9 +1822,9 @@ input_handler(void)
 	 * Do a poll to see if we have data
 	 */
 	for (;;) {
-		memcpy(&fds, &fdmask, sizeof(fdmask));
 		tvzero.tv_sec = tvzero.tv_usec = 0;
 #ifdef HAVE_POLL_H
+		memcpy(fds, fdmask, sizeof(fdmask));
                 n = poll(fds, (unsigned int)nbsock, tvzero.tv_sec * 1000);
 
                 /*
@@ -1838,6 +1839,7 @@ input_handler(void)
                  }
 
 #else
+		fds = fdmask;
                 n = select(maxfd, &fds, (fd_set *)0, (fd_set *)0, &tvzero);
 
                 /*