Bug #614 Fix duplicate descriptor code and properly handle error conditions

bk: 44690f0eeuuqS6oG37YgmgBOTciYKw

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 9614ddeb56e846a1c20987a3a5f4b9a46c7a0b8f..c95a7c925277202972c6dcd4708bf72df13943d1 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -257,11 +257,16 @@ static int dup_fd(int fd)
 
                 tmp = errno;
                 if (newfd == -1)
-                        perror("fcntl");
+               {
+                       msyslog(LOG_ERR, "Error duplicating file descriptor: %m");
+                        return (fd);
+               }
                 (void)close(fd);
                 errno = tmp;
                 return (newfd);
         }
+       else
+               return (fd);
 }
 #endif