Add strerror(errno) to port bind failure on TreeSocket

[user/henk/code/inspircd.git] / src / cmd_kill.cpp

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index bc59f8492602bcad078776dbc4a6e625f7e917f8..d0de52b8d18eba2a80ac49165712f1a90ee3fbd4 100644 (file)
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -35,18 +35,12 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
        char killreason[MAXBUF];
        int MOD_RESULT = 0;
 
-       ServerInstance->Log(DEBUG,"kill: %s %s", parameters[0], parameters[1]);
-
        if (u)
        {
-               ServerInstance->Log(DEBUG, "into kill mechanism");
                FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1]));
 
                if (MOD_RESULT)
-               {
-                       ServerInstance->Log(DEBUG, "A module prevented the kill with result %d", MOD_RESULT);
                        return CMD_FAILURE;
-               }
 
                if (!IS_LOCAL(u))
                {
@@ -56,13 +50,10 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
                        u->WriteCommonExcept("QUIT :%s", killreason);
                        FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason));
                        
-                       user_hash::iterator iter = ServerInstance->clientlist.find(u->nick);
+                       user_hash::iterator iter = ServerInstance->clientlist->find(u->nick);
 
-                       if (iter != ServerInstance->clientlist.end())
-                       {
-                               ServerInstance->Log(DEBUG,"deleting user hash value %d", iter->second);
-                               ServerInstance->clientlist.erase(iter);
-                       }
+                       if (iter != ServerInstance->clientlist->end())
+                               ServerInstance->clientlist->erase(iter);
 
                        if (u->registered == REG_ALL)
                        {