Bug fixes for #611, 612, 614 and 530

bk: 446f83bfrjYA-l6X2QNvLp8WScErsQ

diff --git a/libntp/ntp_rfc2553.c b/libntp/ntp_rfc2553.c
index e4bdc3f5af4e131e967aa3da519d78ec00977346..f2520a7eb2a09381408db0e281345c9ff5a0f0f0 100644 (file)
--- a/libntp/ntp_rfc2553.c
+++ b/libntp/ntp_rfc2553.c
@@ -104,7 +104,9 @@ static char *ai_errlist[] = {
        "Unknown error",                                /* EAI_MAX        */
 };
 
-
+/*
+ * Local declaration
+ */
 int
 DNSlookup_name(
        const char FAR *name,
@@ -256,7 +258,7 @@ getaddrinfo (const char *nodename, const char *servname,
                port = 0;
 
        /*
-       /*
+        *
         * Set up the port number
         */
        if (ai->ai_family == AF_INET)

diff --git a/ntpd/ntp_intres.c b/ntpd/ntp_intres.c
index 43d8270e160cd1ab114a9ab007228aaececbfe22..1ea07ce4d408a3cefc8a0be16aeda161725317d7 100644 (file)
--- a/ntpd/ntp_intres.c
+++ b/ntpd/ntp_intres.c
@@ -528,7 +528,7 @@ findhostaddr(
 
        /*
         * If the resolver failed, see if the failure is
-        * temporary.  If so, return success.
+        * temporary. If so, return success.
         */
        if (error != 0) {
                switch (error)

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index d122555bd83786f7667b7821481665e100395055..cd571f242b256d8d9c498cd0ce526c87c0eb997b 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -1510,16 +1510,18 @@ open_socket(
        }
 #endif /* SYS_WINNT */
 
-#ifdef F_DUPFD
+#if !defined(SYS_WINNT) && defined(F_DUPFD)
        /*
         * Fixup the file descriptor for some systems
+        * See bug #530 for details of the issue.
         */
        fd = dup_fd(fd);
 #endif
 
-
-       /* set SO_REUSEADDR since we will be binding the same port
-          number on each interface */
+       /*
+        * set SO_REUSEADDR since we will be binding the same port
+        * number on each interface
+        */
        if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
                       (char *)&on, sizeof(on)))
        {