Fix memory leak and invalid vtable location on unload of m_sslinfo

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

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 371f99dfaa7ab71b344eda0a545fcb53097ac6fa..419b51c9b7a6f2c7565d0f8728196df136696cd4 100644 (file)
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,13 +20,12 @@
 class CommandVhost : public Command
 {
  public:
-       CommandVhost (InspIRCd* Instance) : Command(Instance,"VHOST", 0, 2)
+       CommandVhost (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"VHOST", 0, 2)
        {
-               this->source = "m_vhost.so";
                syntax = "<username> <password>";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                ConfigReader *Conf = new ConfigReader(ServerInstance);
 
@@ -37,7 +36,7 @@ class CommandVhost : public Command
                        std::string pass = Conf->ReadValue("vhost","pass",index);
                        std::string hash = Conf->ReadValue("vhost","hash",index);
 
-                       if ((!strcmp(parameters[0],username.c_str())) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1], hash.c_str()))
+                       if ((!strcmp(parameters[0].c_str(),username.c_str())) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1].c_str(), hash.c_str()))
                        {
                                if (!mask.empty())
                                {
@@ -58,17 +57,14 @@ class CommandVhost : public Command
 class ModuleVHost : public Module
 {
  private:
+       CommandVhost cmd;
 
-       CommandVhost* mycommand;
-        
  public:
-       ModuleVHost(InspIRCd* Me) : Module(Me)
+       ModuleVHost(InspIRCd* Me) : Module(Me), cmd(Me, this)
        {
-               mycommand = new CommandVhost(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-
+               ServerInstance->AddCommand(&cmd);
        }
-       
+
        virtual ~ModuleVHost()
        {
        }
@@ -76,9 +72,9 @@ class ModuleVHost : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_VENDOR,API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleVHost)