Fix for bug #541: /taxonomy reporting metadata for incorrect user. Can someone please...

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index e98261e5883e31c55d01f4b26826cff3f791b042..5b8b5b7f95e2992161916c80348d8394e198a914 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -27,7 +27,7 @@
 #include <dlfcn.h>
 #endif
 
-int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, const char* hashtype)
+int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
 {
        int MOD_RESULT = 0;
        FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype))
@@ -35,7 +35,7 @@ int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, co
                return 0;
        if (MOD_RESULT == -1)
                return 1;
-       return strcmp(data,input);
+       return data != input; // this seems back to front, but returns 0 if they *match*, 1 else
 }
 
 /* LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list.
@@ -133,10 +133,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 
                        new_parameters[splithere] = item.c_str();
 
-                       /* Execute the command handler over and over. If someone pulls our user
-                        * record out from under us (e.g. if we /kill a comma sep list, and we're
-                        * in that list ourselves) abort if we're gone.
-                        */
+                       /* Execute the command handler. */
                        CommandObj->Handle(new_parameters, user);
 
                        dupes[item.c_str()] = true;
@@ -151,7 +148,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 
 bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user)
 {
-       Commandable::iterator n = cmdlist.find(commandname);
+       Commandtable::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
@@ -175,7 +172,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int
 
 Command* CommandParser::GetHandler(const std::string &commandname)
 {
-       Commandable::iterator n = cmdlist.find(commandname);
+       Commandtable::iterator n = cmdlist.find(commandname);
        if (n != cmdlist.end())
                return n->second;
 
@@ -186,7 +183,7 @@ Command* CommandParser::GetHandler(const std::string &commandname)
 
 CmdResult CommandParser::CallHandler(const std::string &commandname, const std::vector<std::string>& parameters, User *user)
 {
-       Commandable::iterator n = cmdlist.find(commandname);
+       Commandtable::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
@@ -288,7 +285,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
        }
 
        /* find the command, check it exists */
-       Commandable::iterator cm = cmdlist.find(command);
+       Commandtable::iterator cm = cmdlist.find(command);
        
        if (cm == cmdlist.end())
        {
@@ -371,7 +368,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 
 void CommandParser::RemoveCommands(const char* source)
 {
-       Commandable::iterator i,safei;
+       Commandtable::iterator i,safei;
        for (i = cmdlist.begin(); i != cmdlist.end();)
        {
                safei = i;
@@ -380,7 +377,7 @@ void CommandParser::RemoveCommands(const char* source)
        }
 }
 
-void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source)
+void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* source)
 {
        Command* x = safei->second;
        if (x->source == std::string(source))