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 5d20c0a36591f5564b0af77da11798b67fa8dba1..3a293ea319a3ad2a0db6cf5d52bc23dd6616c03b 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.57 2008/11/12 23:45:57 tbox Exp $ */
+/* $Id: socket.c,v 1.237.18.58 2008/11/20 00:07:00 jinmei Exp $ */
 
 /*! \file */
 
@@ -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;