X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_lockserv.cpp;h=2db01b99ae2966ec75d13c887bd84f26a9cb2e64;hb=a032cd90ad5582914759e226085efee5aae1a1ef;hp=7c1bb5bd35c902639907aa9f41a8ee4533115b15;hpb=3b78613576364c4ac6a4e4af43a2eea056c8dd3f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 7c1bb5bd3..2db01b99a 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -24,6 +24,12 @@
  * 988 <nick> <servername> :Closed for new connections
  * 989 <nick> <servername> :Open for new connections
  */
+enum
+{
+	// InspIRCd-specific.
+	RPL_SERVLOCKON = 988,
+	RPL_SERVLOCKOFF = 989
+};
 
 class CommandLockserv : public Command
 {
@@ -36,7 +42,7 @@ class CommandLockserv : public Command
 		flags_needed = 'o';
 	}
 
-	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		if (!locked.empty())
 		{
@@ -45,7 +51,7 @@ class CommandLockserv : public Command
 		}
 
 		locked = parameters.empty() ? "Server is temporarily closed. Please try again later." : parameters[0];
-		user->WriteNumeric(988, user->server->GetName(), "Closed for new connections");
+		user->WriteNumeric(RPL_SERVLOCKON, user->server->GetName(), "Closed for new connections");
 		ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily disallow new connections", user->nick.c_str());
 		return CMD_SUCCESS;
 	}
@@ -61,7 +67,7 @@ class CommandUnlockserv : public Command
 		flags_needed = 'o';
 	}
 
-	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		if (locked.empty())
 		{
@@ -70,7 +76,7 @@ class CommandUnlockserv : public Command
 		}
 
 		locked.clear();
-		user->WriteNumeric(989, user->server->GetName(), "Open for new connections");
+		user->WriteNumeric(RPL_SERVLOCKOFF, user->server->GetName(), "Open for new connections");
 		ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow new connections", user->nick.c_str());
 		return CMD_SUCCESS;
 	}
@@ -94,6 +100,12 @@ class ModuleLockserv : public Module
 			locked.clear();
 	}
 
+	void OnModuleRehash(User* user, const std::string& param) CXX11_OVERRIDE
+	{
+		if (irc::equals(param, "lockserv") && !locked.empty())
+			locked.clear();
+	}
+
 	ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
 	{
 		if (!locked.empty())