Merge branch 'master+foreachneighbor'

[user/henk/code/inspircd.git] / src / coremods / core_oper / cmd_restart.cpp

diff --git a/src/coremods/core_oper/cmd_restart.cpp b/src/coremods/core_oper/cmd_restart.cpp
index 33627b5405049411f5e44b9262de0b1b48316282..4fad752a221962f083d5d1dea5cff7c0fa589cf4 100644 (file)
--- a/src/coremods/core_oper/cmd_restart.cpp
+++ b/src/coremods/core_oper/cmd_restart.cpp
@@ -19,27 +19,19 @@
 
 
 #include "inspircd.h"
+#include "core_oper.h"
 
-/** Handle /RESTART
- */
-class CommandRestart : public Command
+CommandRestart::CommandRestart(Module* parent)
+       : Command(parent, "RESTART", 1, 1)
 {
- public:
-       /** Constructor for restart.
-        */
-       CommandRestart(Module* parent) : Command(parent,"RESTART",1,1) { flags_needed = 'o'; syntax = "<password>"; }
-       /** Handle command.
-        * @param parameters The parameters to the command
-        * @param user The user issuing the command
-        * @return A value from CmdResult to indicate command success or failure.
-        */
-       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
-};
+       flags_needed = 'o';
+       syntax = "<password>";
+}
 
 CmdResult CommandRestart::Handle (const std::vector<std::string>& parameters, User *user)
 {
        ServerInstance->Logs->Log("COMMAND", LOG_DEFAULT, "Restart: %s",user->nick.c_str());
-       if (ServerInstance->PassCompare(user, ServerInstance->Config->restartpass, parameters[0], ServerInstance->Config->powerhash))
+       if (DieRestart::CheckPass(user, parameters[0], "restartpass"))
        {
                ServerInstance->SNO->WriteGlobalSno('a', "RESTART command from %s, restarting server.", user->GetFullRealHost().c_str());
 
@@ -70,6 +62,3 @@ CmdResult CommandRestart::Handle (const std::vector<std::string>& parameters, Us
        }
        return CMD_FAILURE;
 }
-
-
-COMMAND_INIT(CommandRestart)