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 7cc38eaa11da3ef3818cfe2f7318053719fdc66a..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
  */
@@ -43,7 +42,10 @@ class cmd_gloadmodule : public command_t
                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 */
+                       /* 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;
                }
        }
@@ -66,15 +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]);
-                       /* route it! */
-                       return CMD_SUCCESS;
                }
                else
                {
-                       /* XXX - see above note about returning CMD_FAILURE here -- w00t */
+                       /* 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;
        }
 };