Passing invalid instance to dns isnt a good idea

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

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index 82a1f088d3e3eff5bd24d709df85bb837636a093..22525e8cf63a60aad703c1859fd456c9aa285b0a 100644 (file)
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -28,7 +28,6 @@ extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
-extern user_hash clientlist;
 
 void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 {
@@ -57,12 +56,12 @@ void 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 = clientlist.find(u->nick);
+                       user_hash::iterator iter = ServerInstance->clientlist.find(u->nick);
 
-                       if (iter != clientlist.end())
+                       if (iter != ServerInstance->clientlist.end())
                        {
                                log(DEBUG,"deleting user hash value %d", iter->second);
-                               clientlist.erase(iter);
+                               ServerInstance->clientlist.erase(iter);
                        }
 
                        if (u->registered == REG_ALL)
@@ -79,7 +78,7 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
                        user->WriteTo(u, "KILL %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]);
                        WriteOpers("*** Local Kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
                        snprintf(killreason,MAXQUIT,"Killed (%s (%s))", user->nick, parameters[1]);
-                       userrec::QuitUser(u, killreason);
+                       userrec::QuitUser(ServerInstance, u, killreason);
                }
        }
        else