Fix crash on propogation after routed squit has reached it's destination. Thx HiroP.

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

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 2280572d749c5845b4bc216b32149fd7328c17f0..e8ea11378477d2b3d1138fd541b9817ca387a941 100644 (file)
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -13,11 +13,10 @@
 
 /* $ModDesc: Allows global loading of a module. */
 
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /** Handle /GLOADMODULE
  */
@@ -36,11 +35,17 @@ class cmd_gloadmodule : public command_t
                {
                        ServerInstance->WriteOpers("*** NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0],user->nick);
                        user->WriteServ("975 %s %s :Module successfully loaded.",user->nick, parameters[0]);
+
+                       /* route it! */
                        return CMD_SUCCESS;
                }
                else
                {
                        user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                       /* XXX - returning CMD_FAILURE here could potentially mean half the net loads it, half doesn't. pass it on anyway? -- w00t
+                        *
+                        * Returning CMD_SUCCESS would have the same effect, just with less servers. Someone should update this module to properly
+                        * pass the success/failure for each server to the caller (or to all opers) -Special */
                        return CMD_FAILURE;
                }
        }
@@ -63,13 +68,13 @@ class cmd_gunloadmodule : public command_t
                {
                        ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0],user->nick);
                        user->WriteServ("973 %s %s :Module successfully unloaded.",user->nick, parameters[0]);
-                       return CMD_SUCCESS;
                }
                else
                {
+                       /* Return CMD_SUCCESS so the module will be unloaded on any servers it is loaded on - this is a seperate case entirely from loading -Special */
                        user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
-                       return CMD_FAILURE;
                }
+               return CMD_SUCCESS;
        }
 };
 
@@ -112,7 +117,7 @@ class ModuleGlobalLoad : public Module
        cmd_greloadmodule *mycommand3;
        
  public:
-       ModuleGlobalLoad(InspIRCd* Me) : Module::Module(Me)
+       ModuleGlobalLoad(InspIRCd* Me) : Module(Me)
        {
                
                mycommand = new cmd_gloadmodule(ServerInstance);
@@ -153,7 +158,7 @@ class ModuleGlobalLoadFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleGlobalLoadFactory;
 }