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 under the 9.5.1rc1 mark)

diff --git a/CHANGES b/CHANGES
index d99922cd4795da588dc5ce7bd5e79d8aa22bfcef..f5e4266afa742c680f4e94a0f1ffd22e8ce7f9d0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
 
        --- 9.5.1rc1 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]
+
 2496.  [bug]           Add sanity length checks to NSID option. [RT #18813]
 
 2495.  [bug]           Tighten RRSIG checks. [RT #18795]

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 17c063399f351cf0806c5007a770b279bc9698c4..e00fa7cb5178f4282e11ba81b9e39f9bdb97aee5 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.275.10.31 2008/11/12 23:46:31 tbox Exp $ */
+/* $Id: socket.c,v 1.275.10.32 2008/11/20 00:06:01 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;