X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_oper.cpp;h=ae66401aaa812cdd62ae9068cd9f75b0fd204a82;hb=3f971b447fae258a92f2cc6645497cce93f1c04e;hp=55277b1ba5ad3c57742a3e672d247a2f14ee729c;hpb=0b98824cc5767079f0f895111253b98843e15414;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_oper.cpp b/src/commands/cmd_oper.cpp
index 55277b1ba..ae66401aa 100644
--- a/src/commands/cmd_oper.cpp
+++ b/src/commands/cmd_oper.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -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 char* const* parameters, int, User *user)
 {
 	char LoginName[MAXBUF];
 	char Password[MAXBUF];
@@ -45,6 +45,7 @@ CmdResult CommandOper::Handle (const char** parameters, int, User *user)
 	char ClassName[MAXBUF];
 	char TheHost[MAXBUF];
 	char TheIP[MAXBUF];
+	char HashType[MAXBUF];
 	int j;
 	bool found = false;
 	bool type_invalid = false;
@@ -62,9 +63,10 @@ CmdResult CommandOper::Handle (const char** parameters, int, User *user)
 		ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "password", i, Password, MAXBUF);
 		ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "type", i, OperType, MAXBUF);
 		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->OperPassCompare(Password,parameters[1], i);
+		match_pass = !ServerInstance->PassCompare(user, Password,parameters[1], HashType);
 		match_hosts = OneOfMatches(TheHost,TheIP,HostName);
 
 		if (match_login && match_pass && match_hosts)
@@ -80,9 +82,9 @@ CmdResult CommandOper::Handle (const char** parameters, int, User *user)
 					/* found this oper's opertype */
 					if (!ServerInstance->IsNick(TypeName))
 					{
-						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);
 						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,user->ident,user->host);
 						return CMD_FAILURE;
 					}
 					ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","host", j, HostName, MAXBUF);
@@ -106,9 +108,9 @@ CmdResult CommandOper::Handle (const char** parameters, int, User *user)
 	{
 		/* 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));
+		user->WriteNumeric(381, "%s :You are now %s %s",user->nick, strchr("aeiouAEIOU", *OperType) ? "an" : "a", irc::Spacify(OperType));
 		if (!user->IsModeSet('o'))
-			user->Oper(OperType);
+			user->Oper(OperType, LoginName);
 	}
 	else
 	{
@@ -130,7 +132,7 @@ 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);
 			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());
@@ -139,12 +141,12 @@ CmdResult CommandOper::Handle (const char** parameters, int, User *user)
 			Event rmode2((char *)&n, NULL, "send_snoset");
 			rmode2.Send(ServerInstance);
 
-			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,user->ident,user->host,parameters[0],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);
 
 			snprintf(broadcast, MAXBUF, "CONFIGURATION ERROR! Oper block '%s': missing OperType %s",parameters[0],OperType);
 
@@ -153,7 +155,7 @@ CmdResult CommandOper::Handle (const char** parameters, int, User *user)
 			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,user->ident,user->host,parameters[0]);
 			return CMD_FAILURE;
 		}
 	}