Fix memory leak and invalid vtable location on unload of m_sslinfo

[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 02a3a6c9be32b4417ae7b5d7500acbef5cba23fe..3dff80fdf666b870362befd84263539dcacf248c 100644 (file)
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -23,14 +23,11 @@
 
 class CommandLockserv : public Command
 {
-private:
        bool& locked;
-
 public:
-       CommandLockserv (InspIRCd* Instance, bool &lock)
-       : Command(Instance, "LOCKSERV", "o", 0), locked(lock)
+       CommandLockserv (InspIRCd* Instance, Module* Creator, bool& lock)
+               : Command(Instance, Creator, "LOCKSERV", "o", 0), locked(lock)
        {
-               this->source = "m_lockserv.so";
                syntax.clear();
        }
 
@@ -38,7 +35,7 @@ public:
        {
                locked = true;
                user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server);
-               ServerInstance->SNO->WriteToSnoMask('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 close for new connections", user->nick.c_str());
                /* Dont send to the network */
                return CMD_LOCALONLY;
        }
@@ -50,10 +47,9 @@ private:
        bool& locked;
 
 public:
-       CommandUnlockserv (InspIRCd* Instance, bool &lock)
-       : Command(Instance, "UNLOCKSERV", "o", 0), locked(lock)
+       CommandUnlockserv (InspIRCd* Instance, Module* Creator, bool &lock)
+               : Command(Instance, Creator, "UNLOCKSERV", "o", 0), locked(lock)
        {
-               this->source = "m_lockserv.so";
                syntax.clear();
        }
 
@@ -61,7 +57,7 @@ public:
        {
                locked = false;
                user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server);
-               ServerInstance->SNO->WriteToSnoMask('A', "Oper %s used UNLOCKSERV to allow for new connections", user->nick.c_str());
+               ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow for new connections", user->nick.c_str());
                /* Dont send to the network */
                return CMD_LOCALONLY;
        }
@@ -71,8 +67,8 @@ class ModuleLockserv : public Module
 {
 private:
        bool locked;
-       CommandLockserv* lockcommand;
-       CommandUnlockserv* unlockcommand;
+       CommandLockserv lockcommand;
+       CommandUnlockserv unlockcommand;
 
        virtual void ResetLocked()
        {
@@ -80,14 +76,11 @@ private:
        }
 
 public:
-       ModuleLockserv(InspIRCd* Me) : Module(Me)
+       ModuleLockserv(InspIRCd* Me) : Module(Me), lockcommand(Me, this, locked), unlockcommand(Me, this, locked)
        {
                ResetLocked();
-               lockcommand = new CommandLockserv(ServerInstance, locked);
-               ServerInstance->AddCommand(lockcommand);
-
-               unlockcommand = new CommandUnlockserv(ServerInstance, locked);
-               ServerInstance->AddCommand(unlockcommand);
+               ServerInstance->AddCommand(&lockcommand);
+               ServerInstance->AddCommand(&unlockcommand);
                Implementation eventlist[] = { I_OnUserRegister, I_OnRehash, I_OnCheckReady };
                ServerInstance->Modules->Attach(eventlist, this, 3);
        }
@@ -97,24 +90,24 @@ public:
        }
 
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                ResetLocked();
        }
 
-       virtual int OnUserRegister(User* user)
+       virtual ModResult OnUserRegister(User* user)
        {
                if (locked)
                {
                        ServerInstance->Users->QuitUser(user, "Server is temporarily closed. Please try again later.");
-                       return 1;
+                       return MOD_RES_DENY;
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual bool OnCheckReady(User* user)
+       virtual ModResult OnCheckReady(User* user)
        {
-               return !locked;
+               return locked ? MOD_RES_DENY : MOD_RES_PASSTHRU;
        }
 
        virtual Version GetVersion()