X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_oper.cpp;h=e1018f805c4f73cca58857d1275f4514fab5c61b;hb=2ac7d154d9dadbc3d836434b786aa0e8c1660381;hp=2fd7744ee969f6792a3372b1ae981e11e043647c;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_oper.cpp b/src/commands/cmd_oper.cpp
index 2fd7744ee..e1018f805 100644
--- a/src/commands/cmd_oper.cpp
+++ b/src/commands/cmd_oper.cpp
@@ -20,9 +20,6 @@
 
 
 #include "inspircd.h"
-#include "hashcomp.h"
-
-bool OneOfMatches(const char* host, const char* ip, const char* hostlist);
 
 /** Handle /OPER. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
@@ -44,30 +41,14 @@ class CommandOper : public SplitCommand
 	CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser *user);
 };
 
-bool OneOfMatches(const char* host, const char* ip, const std::string& hostlist)
-{
-	std::stringstream hl(hostlist);
-	std::string xhost;
-	while (hl >> xhost)
-	{
-		if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map))
-		{
-			return true;
-		}
-	}
-	return false;
-}
-
 CmdResult CommandOper::HandleLocal(const std::vector<std::string>& parameters, LocalUser *user)
 {
-	char TheHost[MAXBUF];
-	char TheIP[MAXBUF];
 	bool match_login = false;
 	bool match_pass = false;
 	bool match_hosts = false;
 
-	snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(),user->host.c_str());
-	snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(),user->GetIPString());
+	const std::string userHost = user->ident + "@" + user->host;
+	const std::string userIP = user->ident + "@" + user->GetIPString();
 
 	OperIndex::iterator i = ServerInstance->Config->oper_blocks.find(parameters[0]);
 	if (i != ServerInstance->Config->oper_blocks.end())
@@ -76,7 +57,7 @@ CmdResult CommandOper::HandleLocal(const std::vector<std::string>& parameters, L
 		ConfigTag* tag = ifo->oper_block;
 		match_login = true;
 		match_pass = !ServerInstance->PassCompare(user, tag->getString("password"), parameters[1], tag->getString("hash"));
-		match_hosts = OneOfMatches(TheHost,TheIP,tag->getString("host"));
+		match_hosts = InspIRCd::MatchMask(tag->getString("host"), userHost, userIP);
 
 		if (match_pass && match_hosts)
 		{
@@ -85,7 +66,6 @@ CmdResult CommandOper::HandleLocal(const std::vector<std::string>& parameters, L
 			return CMD_SUCCESS;
 		}
 	}
-	char broadcast[MAXBUF];
 
 	std::string fields;
 	if (!match_login)
@@ -99,10 +79,8 @@ CmdResult CommandOper::HandleLocal(const std::vector<std::string>& parameters, L
 	user->WriteNumeric(491, "%s :Invalid oper credentials",user->nick.c_str());
 	user->CommandFloodPenalty += 10000;
 
-	snprintf(broadcast, MAXBUF, "WARNING! Failed oper attempt by %s!%s@%s using login '%s': The following fields do not match: %s", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), parameters[0].c_str(), fields.c_str());
-	ServerInstance->SNO->WriteGlobalSno('o',std::string(broadcast));
-
-	ServerInstance->Logs->Log("OPER",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s using login '%s': The following fields did not match: %s", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), parameters[0].c_str(), fields.c_str());
+	ServerInstance->SNO->WriteGlobalSno('o', "WARNING! Failed oper attempt by %s using login '%s': The following fields do not match: %s", user->GetFullRealHost().c_str(), parameters[0].c_str(), fields.c_str());
+	ServerInstance->Logs->Log("OPER", LOG_DEFAULT, "OPER: Failed oper attempt by %s using login '%s': The following fields did not match: %s", user->GetFullRealHost().c_str(), parameters[0].c_str(), fields.c_str());
 	return CMD_FAILURE;
 }