Fix memory leak and invalid vtable location on unload of m_sslinfo

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

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 8a0ca2aa3b8634b86235ca1a1964093fbc175412..43359c28a04c4bfce40bd3e969d65cbd57c6e75c 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -87,9 +87,8 @@ class ShunFactory : public XLineFactory
 class CommandShun : public Command
 {
  public:
-       CommandShun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3)
+       CommandShun(InspIRCd* Me, Module* Creator) : Command(Me, Creator, "SHUN", "o", 1, 3)
        {
-               this->source = "m_shun.so";
                this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>";
        }
 
@@ -183,7 +182,7 @@ class ModuleShun : public Module
        bool affectopers;
 
  public:
-       ModuleShun(InspIRCd* Me) : Module(Me), cmd(Me), f(Me)
+       ModuleShun(InspIRCd* Me) : Module(Me), cmd(Me, this), f(Me)
        {
                ServerInstance->XLines->RegisterFactory(&f);
                ServerInstance->AddCommand(&cmd);
@@ -199,13 +198,13 @@ class ModuleShun : public Module
                ServerInstance->XLines->UnregisterFactory(&f);
        }
 
-       virtual int OnStats(char symbol, User* user, string_list& out)
+       virtual ModResult OnStats(char symbol, User* user, string_list& out)
        {
                if (symbol != 'S')
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                ServerInstance->XLines->InvokeStats("SHUN", 223, user, out);
-               return 1;
+               return MOD_RES_DENY;
        }
 
        virtual void OnRehash(User* user)
@@ -247,21 +246,21 @@ class ModuleShun : public Module
                }
        }
 
-       virtual int OnPreCommand(std::string &command, std::vector<std::string>& parameters, User* user, bool validated, const std::string &original_line)
+       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string>& parameters, User* user, bool validated, const std::string &original_line)
        {
                if (validated)
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                if (!ServerInstance->XLines->MatchesLine("SHUN", user))
                {
                        /* Not shunned, don't touch. */
-                       return 0;
+                       return MOD_RES_PASSTHRU;
                }
 
                if (!affectopers && IS_OPER(user))
                {
                        /* Don't do anything if the user is an operator and affectopers isn't set */
-                       return 0;
+                       return MOD_RES_PASSTHRU;
                }
 
                std::set<std::string>::iterator i = ShunEnabledCommands.find(command);
@@ -270,7 +269,7 @@ class ModuleShun : public Module
                {
                        if (NotifyOfShun)
                                user->WriteServ("NOTICE %s :*** Command %s not processed, as you have been blocked from issuing commands (SHUN)", user->nick.c_str(), command.c_str());
-                       return 1;
+                       return MOD_RES_DENY;
                }
 
                if (command == "QUIT")
@@ -285,7 +284,7 @@ class ModuleShun : public Module
                }
 
                /* if we're here, allow the command. */
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual Version GetVersion()