Fix memory leak and invalid vtable location on unload of m_sslinfo

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

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 05ae5367615186424aa4bb66716307f66ef61584..e3dafeff39f4a5b843593454aad6f27d19a1977f 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -43,9 +43,8 @@ CmdResult ShowOperMOTD(User* user)
 class CommandOpermotd : public Command
 {
  public:
-       CommandOpermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", "o", 0)
+       CommandOpermotd (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"OPERMOTD", "o", 0)
        {
-               this->source = "m_opermotd.so";
                syntax = "[<servername>]";
        }
 
@@ -58,7 +57,7 @@ class CommandOpermotd : public Command
 
 class ModuleOpermotd : public Module
 {
-       CommandOpermotd* mycommand;
+       CommandOpermotd cmd;
        bool onoper;
  public:
 
@@ -78,11 +77,10 @@ class ModuleOpermotd : public Module
        }
 
        ModuleOpermotd(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), cmd(Me, this)
        {
                opermotd = NULL;
-               mycommand = new CommandOpermotd(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(&cmd);
                opermotd = new FileReader(ServerInstance);
                LoadOperMOTD();
                Implementation eventlist[] = { I_OnRehash, I_OnOper };
@@ -105,7 +103,7 @@ class ModuleOpermotd : public Module
                        ShowOperMOTD(user);
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                LoadOperMOTD();
        }