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

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

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 518eeb0098225f741d7d4e19c79825d95249ff04..8383de739a20f41accb54e69477b6a7ded682e15 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
@@ -22,9 +19,7 @@ class ModuleOperjoin : public Module
 {
        private:
                std::string operChan;
-               std::vector<std::string> operChans;
-               ConfigReader* conf;
-               
+               std::vector<std::string> operChans;             
 
                int tokenize(const string &str, std::vector<std::string> &tokens)
                {
@@ -46,15 +41,9 @@ class ModuleOperjoin : public Module
                }
 
        public:
-               ModuleOperjoin(InspIRCd* Me)
-                       : Module::Module(Me)
+               ModuleOperjoin(InspIRCd* Me) : Module(Me)
                {
-                       
-                       conf = new ConfigReader(ServerInstance);
-                       operChan = conf->ReadValue("operjoin", "channel", 0);
-                       operChans.clear();
-                       if (!operChan.empty())
-                               tokenize(operChan,operChans);
+                       OnRehash(NULL, "");
                }
 
                void Implements(char* List)
@@ -64,17 +53,18 @@ class ModuleOperjoin : public Module
 
                virtual void OnRehash(userrec* user, const std::string &parameter)
                {
-                       DELETE(conf);
-                       conf = new ConfigReader(ServerInstance);
+                       ConfigReader* conf = new ConfigReader(ServerInstance);
+
                        operChan = conf->ReadValue("operjoin", "channel", 0);
                        operChans.clear();
                        if (!operChan.empty())
                                tokenize(operChan,operChans);
+
+                       DELETE(conf);
                }
 
                virtual ~ModuleOperjoin()
                {
-                       DELETE(conf);
                }
 
                virtual Version GetVersion()
@@ -94,24 +84,4 @@ class ModuleOperjoin : public Module
 
 };
 
-class ModuleOperjoinFactory : public ModuleFactory
-{
-       public:
-               ModuleOperjoinFactory()
-               {
-               }
-
-               ~ModuleOperjoinFactory()
-               {
-               }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleOperjoin(Me);
-               }
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleOperjoinFactory;
-}
+MODULE_INIT(ModuleOperjoin)