2498. [bug] Removed a bogus function argument used with

                        ISC_SOCKET_USE_POLLWATCH: it could cause compiler
                        warning or crash named with the debug 1 level
                        of logging. [RT #18917]

diff --git a/CHANGES b/CHANGES
index 65980ea4aa4ba554b2ef58c33cb4b8b9586a6913..42e5dcbdc53aa28ad730e9355ed5dbeafe5c9e4d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2498.  [bug]           Removed a bogus function argument used with
+                       ISC_SOCKET_USE_POLLWATCH: it could cause compiler
+                       warning or crash named with the debug 1 level
+                       of logging. [RT #18917]
 
        --- 9.4.3 released ---
 

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 32396148ae02b2b3ad5b624e2bdaef19221215e3..8b006e46b6fa4a75b5b09f9d51db8e5a72365cb8 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.237.18.56 2008/11/12 03:58:36 marka Exp $ */
+/* $Id: socket.c,v 1.237.18.56.2.1 2008/12/23 00:14:34 marka Exp $ */
 
 /*! \file */
 
@@ -501,7 +501,7 @@ FIX_IPV6_RECVPKTINFO(isc_socket_t *sock)
 
        if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO,
                       (void *)&on, sizeof(on)) < 0) {
-       
+
                UNEXPECTED_ERROR(__FILE__, __LINE__,
                                 "setsockopt(%d, IPV6_RECVPKTINFO) "
                                 "%s: %s", sock->fd,
@@ -3163,7 +3163,6 @@ watcher(void *uap) {
                                                    ISC_LOGCATEGORY_GENERAL,
                                                    ISC_LOGMODULE_SOCKET,
                                                    ISC_LOG_DEBUG(1),
-                                                   ISC_LOG_INFO,
                                                    "unexpected POLL timeout");
                                }
                                pollstate = poll_active;
@@ -4902,7 +4901,7 @@ isc_socket_ipv6only(isc_socket_t *sock, isc_boolean_t yes) {
                if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_V6ONLY,
                               (void *)&onoff, sizeof(int)) < 0) {
                        char strbuf[ISC_STRERRORSIZE];
-       
+
                        UNEXPECTED_ERROR(__FILE__, __LINE__,
                                         "setsockopt(%d, IPV6_V6ONLY) "
                                         "%s: %s", sock->fd,