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 d9cb989a920117c2e7012ad9fcbe67495dd41e97..baf0b4ad890851d786dfee43156c4fd805b598ea 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.3.6 released ---
 

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 3b859202c204f3959ea294728657084bf80c768a..1508487945bebd418dbee277652aaa49780cbcf5 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.207.2.19.2.61 2008/11/12 23:45:26 tbox Exp $ */
+/* $Id: socket.c,v 1.207.2.19.2.62 2008/11/20 00:07:38 jinmei Exp $ */
 
 #include <config.h>
 
@@ -3125,7 +3125,6 @@ watcher(void *uap) {
                                                    ISC_LOGCATEGORY_GENERAL,
                                                    ISC_LOGMODULE_SOCKET,
                                                    ISC_LOG_DEBUG(1),
-                                                   ISC_LOG_INFO,
                                                    "unexpected POLL timeout");
                                }
                                pollstate = poll_active;