Improve the clean-up of outdated IAuth instances on rehash (SF bug #2789656).

[ircu2.10.12-pk.git] / ircd / engine_kqueue.c

diff --git a/ircd/engine_kqueue.c b/ircd/engine_kqueue.c
index 914a09cedf7f6b75e19d7a59ceba04c82af4c28f..577cac01d57cd4785dbbe70a26f00b61fda9daa8 100644 (file)
--- a/ircd/engine_kqueue.c
+++ b/ircd/engine_kqueue.c
@@ -30,13 +30,13 @@
 #include "ircd_log.h"
 #include "s_debug.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <signal.h>
+#include <sys/types.h>
 #include <sys/event.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 
@@ -298,11 +298,6 @@ engine_delete(struct Socket* sock)
   dellist[1].data = 0;
   dellist[1].udata = 0;
 
-  /* make it all go away */
-  if (kevent(kqueue_id, dellist, 2, 0, 0, 0) < 0)
-    log_write(LS_SOCKET, L_WARNING, 0,
-             "Unable to delete kevent items for socket %d", s_fd(sock));
-
   sockList[s_fd(sock)] = 0;
 }
 
@@ -437,8 +432,6 @@ engine_loop(struct Generators* gen)
        break;
       }
 
-      assert(s_fd(sock) == events[i].ident);
-
       gen_ref_dec(sock); /* we're done with it */
     }