Update a header i left out

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 887ef0551e63e78410056edcc33e7e5a02d69bfb..0b2ea69c91ee069872590f3e3889b3c092c2c4fc 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;
@@ -332,7 +329,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
                /* command is disabled! */
                user->WriteNumeric(421, "%s %s :This command has been disabled.",user->nick.c_str(),command.c_str());
                ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)",
-                               command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host);
+                               command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str());
                return do_more;
        }
        if (command_p.size() < cm->second->min_params)