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

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

diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index a2c45641cedff1895fda72e756f45ab36b981cec..d65fdf7e008582ee532cbb4916ec64b40174a5bc 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Forces users to join the specified channel(s) on connect */
@@ -46,11 +43,16 @@ class ModuleConnJoin : public Module
 
        public:
                ModuleConnJoin(InspIRCd* Me)
-                       : Module::Module(Me)
+                       : Module(Me)
                {
                        OnRehash(NULL, "");
                }
 
+               Priority Prioritize()
+               {
+                       return PRIORITY_LAST;
+               }
+
                void Implements(char* List)
                {
                        List[I_OnPostConnect] = List[I_OnRehash] = 1;
@@ -87,24 +89,5 @@ class ModuleConnJoin : public Module
 
 };
 
-class ModuleConnJoinFactory : public ModuleFactory
-{
-       public:
-               ModuleConnJoinFactory()
-               {
-               }
 
-               ~ModuleConnJoinFactory()
-               {
-               }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleConnJoin(Me);
-               }
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleConnJoinFactory;
-}
+MODULE_INIT(ModuleConnJoin)