Move all_opers into class InspIRCd

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index e6b105925b39a2cbe5c06f37a6569b07889e60b1..18c86f631af53c372718cfa7991e3a25ba6d435a 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -29,7 +29,6 @@ using namespace std;
 #include "modules.h"
 #include "dynamic.h"
 #include "wildcard.h"
-#include "message.h"
 #include "commands.h"
 #include "xline.h"
 #include "inspstring.h"
@@ -40,7 +39,6 @@ using namespace std;
 #include "cull_list.h"
 
 extern InspIRCd* ServerInstance;
-extern user_hash clientlist;
 
 /*
  * In current implementation of CullList, this isn't used. It did odd things with a lot of sockets.
@@ -52,7 +50,7 @@ bool CullList::IsValid(userrec* user)
        if (es != exempt.end())
                esignon = es->second;
 
-       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+       for (user_hash::iterator u = ServerInstance->clientlist.begin(); u != ServerInstance->clientlist.end(); u++)
        {
                /*
                 * BUGFIX
@@ -133,7 +131,7 @@ int CullList::Apply()
        {
                std::vector<CullItem>::iterator a = list.begin();
 
-               userrec::QuitUser(a->GetUser(), a->GetReason().c_str());
+               userrec::QuitUser(ServerInstance, a->GetUser(), a->GetReason().c_str());
                list.erase(list.begin());
        }
        return n;