X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=d89d7cbb597097568a781d3f96ec9db7a2f1a4fb;hb=30fec322809582f91be70cc1bb16c9678180db76;hp=20977995b944b48df14a0110826ff4d06021800c;hpb=36f12984d3010bfad69de0c37a3203b0c471521c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 20977995b..d89d7cbb5 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -23,25 +23,24 @@
 
 #include "inspircd.h"
 
-int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
+bool InspIRCd::PassCompare(Extensible* ex, const std::string& data, const std::string& input, const std::string& hashtype)
 {
 	ModResult res;
 	FIRST_MOD_RESULT(OnPassCompare, res, (ex, data, input, hashtype));
 
 	/* Module matched */
 	if (res == MOD_RES_ALLOW)
-		return 0;
+		return true;
 
 	/* Module explicitly didnt match */
 	if (res == MOD_RES_DENY)
-		return 1;
+		return false;
 
 	/* We dont handle any hash types except for plaintext - Thanks tra26 */
 	if (!hashtype.empty() && hashtype != "plaintext")
-		/* See below. 1 because they dont match */
-		return 1;
+		return false;
 
-	return (data != input); // this seems back to front, but returns 0 if they *match*, 1 else
+	return (data == input);
 }
 
 bool CommandParser::LoopCall(User* user, Command* handler, const std::vector<std::string>& parameters, unsigned int splithere, int extra, bool usemax)
@@ -119,7 +118,7 @@ Command* CommandParser::GetHandler(const std::string &commandname)
 
 // calls a handler function for a command
 
-CmdResult CommandParser::CallHandler(const std::string &commandname, const std::vector<std::string>& parameters, User *user)
+CmdResult CommandParser::CallHandler(const std::string& commandname, const std::vector<std::string>& parameters, User* user, Command** cmd)
 {
 	Commandtable::iterator n = cmdlist.find(commandname);
 
@@ -151,6 +150,8 @@ CmdResult CommandParser::CallHandler(const std::string &commandname, const std::
 
 			if (bOkay)
 			{
+				if (cmd)
+					*cmd = n->second;
 				return n->second->Handle(parameters,user);
 			}
 		}
@@ -280,7 +281,7 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 			user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s :This command has been disabled.", command.c_str());
 		}
 
-		ServerInstance->SNO->WriteToSnoMask('t', "%s denied for %s (%s@%s)",
+		ServerInstance->SNO->WriteToSnoMask('a', "%s denied for %s (%s@%s)",
 				command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str());
 		return;
 	}