X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=7c18c8ab19cd8cb772bac95d3eddeecc479f34ca;hb=4d42d544584875d0d71dab99f6785ac98324b971;hp=8798f03f0d9798f3af24edc62c86d454db785e92;hpb=be2a677ddd01859a61f484aa8f1e5d916a8f3ca5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 8798f03f0..7c18c8ab1 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -30,11 +30,21 @@ int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::st
 {
 	int MOD_RESULT = 0;
 	FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype))
+
+	/* Module matched */
 	if (MOD_RESULT == 1)
 		return 0;
+
+	/* Module explicitly didnt match */
 	if (MOD_RESULT == -1)
 		return 1;
-	return data != input; // this seems back to front, but returns 0 if they *match*, 1 else
+
+	/* We dont handle any hash types except for plaintext - Thanks tra26 */
+	if (hashtype != "" && hashtype != "plaintext")
+		/* See below. 1 because they dont match */
+		return 1;
+
+	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.
@@ -59,10 +69,10 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 		return 0;
 
 	/** Some lame ircds will weed out dupes using some shitty O(n^2) algorithm.
-	 * By using std::map (thanks for the idea w00t) we can cut this down a ton.
+	 * By using std::set (thanks for the idea w00t) we can cut this down a ton.
 	 * ...VOOODOOOO!
 	 */
-	std::map<irc::string, bool> dupes;
+	std::set<irc::string> dupes;
 
 	/* Create two lists, one for channel names, one for keys
 	 */
@@ -93,7 +103,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 
 			CommandObj->Handle(new_parameters, user);
 
-			dupes[item.c_str()] = true;
+			dupes.insert(item.c_str());
 		}
 	}
 	return 1;
@@ -110,7 +120,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 	if (parameters[splithere].find(',') == std::string::npos)
 		return 0;
 
-	std::map<irc::string, bool> dupes;
+	std::set<irc::string> dupes;
 
 	/* Only one commasepstream here */
 	irc::commasepstream items1(parameters[splithere]);
@@ -135,7 +145,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 			/* Execute the command handler. */
 			CommandObj->Handle(new_parameters, user);
 
-			dupes[item.c_str()] = true;
+			dupes.insert(item.c_str());
 		}
 	}
 	/* By returning 1 we tell our caller that nothing is to be done,
@@ -252,10 +262,10 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 		command_p.push_back(token);
 
 	std::transform(command.begin(), command.end(), command.begin(), ::toupper);
-		
+
 	/* find the command, check it exists */
 	Commandtable::iterator cm = cmdlist.find(command);
-	
+
 	if (cm == cmdlist.end())
 	{
 		int MOD_RESULT = 0;
@@ -300,7 +310,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 		{
 			// BE CAREFUL: .end() returns past the end of the vector, hence decrement.
 			std::vector<std::string>::iterator it = --command_p.end();
-		
+
 			lparam.insert(0, " " + *(it));
 			command_p.erase(it); // remove last element
 		}
@@ -515,7 +525,7 @@ bool CommandParser::ReloadCommand(std::string cmd, User* user)
 	return false;
 }
 
-CmdResult cmd_reload::Handle(const std::vector<std::string>& parameters, User *user)
+CmdResult CommandReload::Handle(const std::vector<std::string>& parameters, User *user)
 {
 	if (parameters.size() < 1)
 		return CMD_FAILURE;
@@ -578,7 +588,7 @@ void CommandParser::SetupCommandTable()
 		dirent* entry = NULL;
 		while (0 != (entry = readdir(library)))
 		{
-			if (InspIRCd::Match(entry->d_name, "cmd_*.so"))
+			if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map))
 			{
 				printf(".");
 				fflush(stdout);
@@ -596,7 +606,7 @@ void CommandParser::SetupCommandTable()
 	}
 
 	if (cmdlist.find("RELOAD") == cmdlist.end())
-		this->CreateCommand(new cmd_reload(ServerInstance));
+		this->CreateCommand(new CommandReload(ServerInstance));
 }
 
 int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest)
@@ -669,5 +679,3 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st
 
 	return translations;
 }
-
-