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]

(Note that this entry is placed below the 9.6.0rc1 mark)

diff --git a/CHANGES b/CHANGES
index 04f8ca99318dcc598341ecb77203c2c342470dac..c7555ab38f8bda23cc634da2c51d6f7ece6958e9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
 
        --- 9.6.0rc1 released ---
 
+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]
+
 2497.  [bug]           Don't add RRSIG bit to NSEC3 bit map for insecure
                        delegation.
 

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 1ae1071ab21fe9776903754ef042090113d88136..98d0ab6e749e76744ef68b23265be13c5915f2c8 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.307 2008/11/12 23:47:17 tbox Exp $ */
+/* $Id: socket.c,v 1.308 2008/11/20 00:04:17 jinmei Exp $ */
 
 /*! \file */
 
@@ -3365,7 +3365,6 @@ watcher(void *uap) {
                                                    ISC_LOGCATEGORY_GENERAL,
                                                    ISC_LOGMODULE_SOCKET,
                                                    ISC_LOG_DEBUG(1),
-                                                   ISC_LOG_INFO,
                                                    "unexpected POLL timeout");
                                }
                                pollstate = poll_active;