Fix mistakenly using Clang instead of GCC on older FreeBSD versions.

[user/henk/code/inspircd.git] / src / modules / m_lockserv.cpp

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index dc71101a86916878ee75f2dda0cfe4df6385f9b8..4983ae16abe3afa01eaa7022feca4fe7c2a51f7c 100644 (file)
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -39,9 +39,15 @@ public:
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
+               if (locked)
+               {
+                       user->WriteServ("NOTICE %s :The server is already locked.", user->nick.c_str());
+                       return CMD_FAILURE;
+               }
+
                locked = true;
                user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server.c_str());
-               ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily close for new connections", user->nick.c_str());
+               ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily disallow new connections", user->nick.c_str());
                return CMD_SUCCESS;
        }
 };
@@ -59,9 +65,15 @@ public:
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
+               if (!locked)
+               {
+                       user->WriteServ("NOTICE %s :The server isn't locked.", user->nick.c_str());
+                       return CMD_FAILURE;
+               }
+
                locked = false;
                user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server.c_str());
-               ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow for new connections", user->nick.c_str());
+               ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow new connections", user->nick.c_str());
                return CMD_SUCCESS;
        }
 };
@@ -75,12 +87,16 @@ private:
 
 public:
        ModuleLockserv() : lockcommand(this, locked), unlockcommand(this, locked)
+       {
+       }
+
+       void init()
        {
                locked = false;
-               ServerInstance->AddCommand(&lockcommand);
-               ServerInstance->AddCommand(&unlockcommand);
+               ServerInstance->Modules->AddService(lockcommand);
+               ServerInstance->Modules->AddService(unlockcommand);
                Implementation eventlist[] = { I_OnUserRegister, I_OnRehash, I_OnCheckReady };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual ~ModuleLockserv()