Fix passing wrong instance to resolver

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

diff --git a/src/xline.cpp b/src/xline.cpp
index ae66b939d2c41e8d04fbe9351e6619d93da0dd6c..d3821b528147c2a66b05c43782823d4064379c41 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -44,8 +44,6 @@ extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
-extern user_hash clientlist;
-extern std::vector<userrec*> local_users;
 
 /* Version two, now with optimized expiry!
  *
@@ -97,18 +95,18 @@ bool KSortComparison ( const KLine one, const KLine two );
 // this way these days, such as qlines against 
 // services nicks, etc.
 
-bool InitXLine(const char* tag)
+bool InitXLine(ServerConfig* conf, const char* tag)
 {
        return true;
 }
 
-bool DoneXLine(const char* tag)
+bool DoneXLine(ServerConfig* conf, const char* tag)
 {
        apply_lines(APPLY_ALL);
        return true;
 }
 
-bool DoZLine(const char* tag, char** entries, void** values, int* types)
+bool DoZLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
 {
        char* reason = (char*)values[0];
        char* ipmask = (char*)values[1];
@@ -118,7 +116,7 @@ bool DoZLine(const char* tag, char** entries, void** values, int* types)
        return true;
 }
 
-bool DoQLine(const char* tag, char** entries, void** values, int* types)
+bool DoQLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
 {
        char* reason = (char*)values[0];
        char* nick = (char*)values[1];
@@ -128,7 +126,7 @@ bool DoQLine(const char* tag, char** entries, void** values, int* types)
        return true;
 }
 
-bool DoKLine(const char* tag, char** entries, void** values, int* types)
+bool DoKLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
 {
        char* reason = (char*)values[0];
        char* host = (char*)values[1];
@@ -138,7 +136,7 @@ bool DoKLine(const char* tag, char** entries, void** values, int* types)
        return true;
 }
 
-bool DoELine(const char* tag, char** entries, void** values, int* types)
+bool DoELine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
 {
        char* reason = (char*)values[0];
        char* host = (char*)values[1];
@@ -666,7 +664,7 @@ void apply_lines(const int What)
 
        CullList* Goners = new CullList();
        char* check = NULL;
-       for (std::vector<userrec*>::const_iterator u2 = local_users.begin(); u2 != local_users.end(); u2++)
+       for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
        {
                userrec* u = (userrec*)(*u2);
                u->MakeHost(host);