Merge pull request #1217 from SaberUK/master+die-restart

Undocument <power> and set the default to the server name.

3 files changed, 3 insertions, 3 deletions

diff --git a/src/coremods/core_oper/cmd_die.cpp b/src/coremods/core_oper/cmd_die.cpp
index 4bc6c25db..ff9318de1 100644
--- a/src/coremods/core_oper/cmd_die.cpp
+++ b/src/coremods/core_oper/cmd_die.cpp
@@ -26,7 +26,7 @@ CommandDie::CommandDie(Module* parent)
 	: Command(parent, "DIE", 1)
 {
 	flags_needed = 'o';
-	syntax = "<password>";
+	syntax = "<server>";
 }
 
 static void QuitAll()
diff --git a/src/coremods/core_oper/cmd_restart.cpp b/src/coremods/core_oper/cmd_restart.cpp
index 3e219727f..836708626 100644
--- a/src/coremods/core_oper/cmd_restart.cpp
+++ b/src/coremods/core_oper/cmd_restart.cpp
@@ -25,7 +25,7 @@ CommandRestart::CommandRestart(Module* parent)
 	: Command(parent, "RESTART", 1, 1)
 {
 	flags_needed = 'o';
-	syntax = "<password>";
+	syntax = "<server>";
 }
 
 CmdResult CommandRestart::Handle (const std::vector<std::string>& parameters, User *user)
diff --git a/src/coremods/core_oper/core_oper.cpp b/src/coremods/core_oper/core_oper.cpp
index 0fc82df8f..a6b2abd81 100644
--- a/src/coremods/core_oper/core_oper.cpp
+++ b/src/coremods/core_oper/core_oper.cpp
@@ -27,7 +27,7 @@ namespace DieRestart
 		ConfigTag* tag = ServerInstance->Config->ConfValue("power");
 		// The hash method for *BOTH* the die and restart passwords
 		const std::string hash = tag->getString("hash");
-		const std::string correctpass = tag->getString(confentry);
+		const std::string correctpass = tag->getString(confentry,  ServerInstance->Config->ServerName);
 		return ServerInstance->PassCompare(user, correctpass, inputpass, hash);
 	}
 }