X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_oper.cpp;h=97134f0389fa5116e2e85c6c6098571c519c1629;hb=2d4a319d961e3f9e6aa9f7926f9ed320d72de8da;hp=4d4c54932185628b10e1709ce4dbacd5e5028fe0;hpb=20bea3078d67a090ebcca64bf3cdbd7e6ab6adb6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_oper.cpp b/src/commands/cmd_oper.cpp
index 4d4c54932..97134f038 100644
--- a/src/commands/cmd_oper.cpp
+++ b/src/commands/cmd_oper.cpp
@@ -22,7 +22,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 	std::string xhost;
 	while (hl >> xhost)
 	{
-		if (match(host,xhost.c_str()) || match(ip,xhost.c_str(),true))
+		if (match(host, xhost) || match(ip,xhost, true))
 		{
 			return true;
 		}
@@ -35,7 +35,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandOper(Instance);
 }
 
-CmdResult CommandOper::Handle (const char** parameters, int, User *user)
+CmdResult CommandOper::Handle (const std::vector<std::string>& parameters, User *user)
 {
 	char LoginName[MAXBUF];
 	char Password[MAXBUF];
@@ -54,8 +54,8 @@ CmdResult CommandOper::Handle (const char** parameters, int, User *user)
 	bool match_pass = false;
 	bool match_hosts = false;
 
-	snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host);
-	snprintf(TheIP, MAXBUF,"%s@%s",user->ident,user->GetIPString());
+	snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(),user->host.c_str());
+	snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(),user->GetIPString());
 
 	for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "oper"); i++)
 	{
@@ -65,8 +65,8 @@ CmdResult CommandOper::Handle (const char** parameters, int, User *user)
 		ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "host", i, HostName, MAXBUF);
 		ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "hash", i, HashType, MAXBUF);
 
-		match_login = !strcmp(LoginName,parameters[0]);
-		match_pass = !ServerInstance->PassCompare(user, Password,parameters[1], HashType);
+		match_login = (LoginName == parameters[0]);
+		match_pass = !ServerInstance->PassCompare(user, Password, parameters[1], HashType);
 		match_hosts = OneOfMatches(TheHost,TheIP,HostName);
 
 		if (match_login && match_pass && match_hosts)
@@ -80,11 +80,11 @@ CmdResult CommandOper::Handle (const char** parameters, int, User *user)
 				if (!strcmp(TypeName,OperType))
 				{
 					/* found this oper's opertype */
-					if (!ServerInstance->IsNick(TypeName))
+					if (!ServerInstance->IsNick(TypeName, ServerInstance->Config->Limits.NickMax))
 					{
-						user->WriteServ("491 %s :Invalid oper type (oper types must follow the same syntax as nicknames)",user->nick);
+						user->WriteNumeric(491, "%s :Invalid oper type (oper types must follow the same syntax as nicknames)",user->nick.c_str());
 						ServerInstance->SNO->WriteToSnoMask('o',"CONFIGURATION ERROR! Oper type '%s' contains invalid characters",OperType);
-						ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type erroneous.",user->nick,user->ident,user->host);
+						ServerInstance->Logs->Log("OPER",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type erroneous.", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
 						return CMD_FAILURE;
 					}
 					ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","host", j, HostName, MAXBUF);
@@ -107,15 +107,13 @@ CmdResult CommandOper::Handle (const char** parameters, int, User *user)
 	if (found)
 	{
 		/* correct oper credentials */
-		ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')",user->nick,user->ident,user->host,irc::Spacify(OperType),parameters[0]);
-		user->WriteServ("381 %s :You are now %s %s",user->nick, strchr("aeiouAEIOU", *OperType) ? "an" : "a", irc::Spacify(OperType));
+		ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), irc::Spacify(OperType), parameters[0].c_str());
+		user->WriteNumeric(381, "%s :You are now %s %s",user->nick.c_str(), strchr("aeiouAEIOU", *OperType) ? "an" : "a", irc::Spacify(OperType));
 		if (!user->IsModeSet('o'))
 			user->Oper(OperType, LoginName);
 	}
 	else
 	{
-		std::deque<std::string> n;
-		n.push_back("o");
 		char broadcast[MAXBUF];
 
 		if (!type_invalid)
@@ -132,30 +130,25 @@ CmdResult CommandOper::Handle (const char** parameters, int, User *user)
 			}
 
 			// tell them they suck, and lag them up to help prevent brute-force attacks
-			user->WriteServ("491 %s :Invalid oper credentials",user->nick);
+			user->WriteNumeric(491, "%s :Invalid oper credentials",user->nick.c_str());
 			user->IncreasePenalty(10);
 			
-			snprintf(broadcast, MAXBUF, "WARNING! Failed oper attempt by %s!%s@%s using login '%s': The following fields do not match: %s",user->nick,user->ident,user->host, parameters[0], fields.c_str());
+			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->WriteToSnoMask('o',std::string(broadcast));
-			n.push_back(broadcast);
-			Event rmode2((char *)&n, NULL, "send_snoset");
-			rmode2.Send(ServerInstance);
+			ServerInstance->PI->SendSNONotice("o", std::string("OPER: ") + broadcast);
 
-			ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s using login '%s': The following fields did not match: %s",user->nick,user->ident,user->host,parameters[0],fields.c_str());
+			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());
 			return CMD_FAILURE;
 		}
 		else
 		{
-			user->WriteServ("491 %s :Your oper block does not have a valid opertype associated with it",user->nick);
+			user->WriteNumeric(491, "%s :Your oper block does not have a valid opertype associated with it",user->nick.c_str());
 
-			snprintf(broadcast, MAXBUF, "CONFIGURATION ERROR! Oper block '%s': missing OperType %s",parameters[0],OperType);
+			snprintf(broadcast, MAXBUF, "CONFIGURATION ERROR! Oper block '%s': missing OperType %s",parameters[0].c_str(),OperType);
 
 			ServerInstance->SNO->WriteToSnoMask('o', std::string(broadcast));
-			n.push_back(broadcast);
-			Event rmode2((char *)&n, NULL, "send_snoset");
-			rmode2.Send(ServerInstance);
 
-			ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s using login '%s': credentials valid, but oper type nonexistent.",user->nick,user->ident,user->host,parameters[0]);
+			ServerInstance->Logs->Log("OPER",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s using login '%s': credentials valid, but oper type nonexistent.", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), parameters[0].c_str());
 			return CMD_FAILURE;
 		}
 	}