X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_die.cpp;h=6424584e314d749da4966f4974319e7c2b2dbe69;hb=87dd84a97265843cfe19f20c207c1c72f38a4f2d;hp=0a82c5b5848523f9a05f5884419968ffdecef2be;hpb=932e069f287ceeb184eafae71c0e22b259e62740;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_die.cpp b/src/commands/cmd_die.cpp
index 0a82c5b58..6424584e3 100644
--- a/src/commands/cmd_die.cpp
+++ b/src/commands/cmd_die.cpp
@@ -22,13 +22,15 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /DIE
  */
-CmdResult CommandDie::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandDie::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	if (!strcmp(parameters[0],ServerInstance->Config->diepass))
+	if (!ServerInstance->PassCompare(user, ServerInstance->Config->diepass, parameters[0].c_str(), ServerInstance->Config->powerhash))
 	{
-		std::string diebuf = std::string("*** DIE command from ") + user->nick + "!" + user->ident + "@" + user->dhost + ". Terminating in " + ConvToStr(ServerInstance->Config->DieDelay) + " seconds.";
-		ServerInstance->Log(SPARSE, diebuf);
-		ServerInstance->SendError(diebuf);
+		{
+			std::string diebuf = std::string("*** DIE command from ") + user->nick + "!" + user->ident + "@" + user->dhost + ". Terminating in " + ConvToStr(ServerInstance->Config->DieDelay) + " seconds.";
+			ServerInstance->Logs->Log("COMMAND",SPARSE, diebuf);
+			ServerInstance->SendError(diebuf);
+		}
 		
 		if (ServerInstance->Config->DieDelay)
 			sleep(ServerInstance->Config->DieDelay);
@@ -37,8 +39,8 @@ CmdResult CommandDie::Handle (const char** parameters, int pcnt, User *user)
 	}
 	else
 	{
-		ServerInstance->Log(SPARSE, "Failed /DIE command from %s!%s@%s", user->nick, user->ident, user->host);
-		ServerInstance->SNO->WriteToSnoMask('O', "Failed DIE Command from %s!%s@%s.",user->nick,user->ident,user->host);
+		ServerInstance->Logs->Log("COMMAND",SPARSE, "Failed /DIE command from %s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
+		ServerInstance->SNO->WriteToSnoMask('A', "Failed DIE Command from %s!%s@%s.",user->nick.c_str(),user->ident.c_str(),user->host.c_str());
 		return CMD_FAILURE;
 	}
 	return CMD_SUCCESS;