Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

[user/henk/code/inspircd.git] / src / commands / cmd_die.cpp

diff --git a/src/commands/cmd_die.cpp b/src/commands/cmd_die.cpp
index a3cee5fad44b3c090aae2e56352f1e2466566b10..1d6640213c445feab12b9429c56be25b4cb7e4fc 100644 (file)
--- a/src/commands/cmd_die.cpp
+++ b/src/commands/cmd_die.cpp
@@ -49,7 +49,7 @@ CmdResult CommandDie::Handle (const std::vector<std::string>& parameters, User *
        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.";
+                       std::string diebuf = "*** DIE command from " + user->GetFullHost() + ". Terminating.";
                        ServerInstance->Logs->Log("COMMAND",SPARSE, diebuf);
                        ServerInstance->SendError(diebuf);
                }
@@ -58,8 +58,8 @@ CmdResult CommandDie::Handle (const std::vector<std::string>& parameters, User *
        }
        else
        {
-               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->WriteGlobalSno('a', "Failed DIE Command from %s!%s@%s.",user->nick.c_str(),user->ident.c_str(),user->host.c_str());
+               ServerInstance->Logs->Log("COMMAND",SPARSE, "Failed /DIE command from %s", user->GetFullRealHost().c_str());
+               ServerInstance->SNO->WriteGlobalSno('a', "Failed DIE Command from %s.", user->GetFullRealHost().c_str());
                return CMD_FAILURE;
        }
        return CMD_SUCCESS;