Was checking 'channel', not 'dest'.

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

diff --git a/src/users.cpp b/src/users.cpp
index 51692958c41f05f5ba97106490ffbecff5fabef8..02f6a28ee60b26478b831314f5019a92e7d868b4 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -26,36 +26,30 @@
 
 static unsigned long already_sent[MAX_DESCRIPTORS] = {0};
 
-typedef std::map<irc::string,char*> opertype_t;
-typedef opertype_t operclass_t;
-
-opertype_t opertypes;
-operclass_t operclass;
-
 /* XXX: Used for speeding up WriteCommon operations */
 unsigned long uniq_id = 0;
 
 bool InitTypes(ServerConfig* conf, const char* tag)
 {
-       for (opertype_t::iterator n = opertypes.begin(); n != opertypes.end(); n++)
+       for (opertype_t::iterator n = conf->opertypes.begin(); n != conf->opertypes.end(); n++)
        {
                if (n->second)
                        delete[] n->second;
        }
        
-       opertypes.clear();
+       conf->opertypes.clear();
        return true;
 }
 
 bool InitClasses(ServerConfig* conf, const char* tag)
 {
-       for (operclass_t::iterator n = operclass.begin(); n != operclass.end(); n++)
+       for (operclass_t::iterator n = conf->operclass.begin(); n != conf->operclass.end(); n++)
        {
                if (n->second)
                        delete[] n->second;
        }
        
-       operclass.clear();
+       conf->operclass.clear();
        return true;
 }
 
@@ -64,7 +58,7 @@ bool DoType(ServerConfig* conf, const char* tag, char** entries, void** values,
        char* TypeName = (char*)values[0];
        char* Classes = (char*)values[1];
        
-       opertypes[TypeName] = strdup(Classes);
+       conf->opertypes[TypeName] = strdup(Classes);
        conf->GetInstance()->Log(DEBUG,"Read oper TYPE '%s' with classes '%s'",TypeName,Classes);
        return true;
 }
@@ -74,7 +68,7 @@ bool DoClass(ServerConfig* conf, const char* tag, char** entries, void** values,
        char* ClassName = (char*)values[0];
        char* CommandList = (char*)values[1];
        
-       operclass[ClassName] = strdup(CommandList);
+       conf->operclass[ClassName] = strdup(CommandList);
        conf->GetInstance()->Log(DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
        return true;
 }
@@ -455,15 +449,15 @@ bool userrec::HasPermission(const std::string &command)
        // are they even an oper at all?
        if (*this->oper)
        {
-               opertype_t::iterator iter_opertype = opertypes.find(this->oper);
-               if (iter_opertype != opertypes.end())
+               opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper);
+               if (iter_opertype != ServerInstance->Config->opertypes.end())
                {
                        char* Classes = strdup(iter_opertype->second);
                        char* myclass = strtok_r(Classes," ",&savept);
                        while (myclass)
                        {
-                               operclass_t::iterator iter_operclass = operclass.find(myclass);
-                               if (iter_operclass != operclass.end())
+                               operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass);
+                               if (iter_operclass != ServerInstance->Config->operclass.end())
                                {
                                        char* CommandList = strdup(iter_operclass->second);
                                        mycmd = strtok_r(CommandList," ",&savept2);