Fix potential for duplicate SID if the SID is auto generated.

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

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 2226f9776c7b0ce503c34ef727d3b1a102cf77fd..23b5d82803ae57e452e8f48b11d106b4bcb58a71 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -11,12 +11,7 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <vector>
-#include "users.h"
-#include "channels.h"
 #include "inspircd.h"
-#include "modules.h"
 #include "wildcard.h"
 
 /* $ModDesc: Sets (and unsets) modes on users when they connect */
@@ -29,7 +24,7 @@ class ModuleModesOnConnect : public Module
 
  public:
        ModuleModesOnConnect(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                Conf = new ConfigReader(ServerInstance);
@@ -67,7 +62,7 @@ class ModuleModesOnConnect : public Module
                        if ((match(user->GetIPString(),hostn.c_str(),true)) || (match(user->host,hostn.c_str())))
                        {
                                std::string ThisModes = Conf->ReadValue("connect","modes",j);
-                               if (ThisModes != "")
+                               if (!ThisModes.empty())
                                {
                                        std::string buf;
                                        stringstream ss(ThisModes);
@@ -79,7 +74,7 @@ class ModuleModesOnConnect : public Module
                                                tokens.push_back(buf);
 
                                        int size = tokens.size() + 1;
-                                       const char* modes[size];
+                                       const char** modes = new const char*[size];
                                        modes[0] = user->nick;
                                        modes[1] = tokens[0].c_str();
 
@@ -95,6 +90,7 @@ class ModuleModesOnConnect : public Module
                                        }
 
                                        ServerInstance->Parser->CallHandler("MODE", modes, size, user);
+                                       delete [] modes;
                                }
                                break;
                        }
@@ -102,29 +98,4 @@ class ModuleModesOnConnect : public Module
        }
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleModesOnConnectFactory : public ModuleFactory
-{
- public:
-       ModuleModesOnConnectFactory()
-       {
-       }
-       
-       ~ModuleModesOnConnectFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleModesOnConnect(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleModesOnConnectFactory;
-}
-
+MODULE_INIT(ModuleModesOnConnect)