Merge insp20

[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 eda654423af55c944683388452dae0a609d946c3..8ee8472e676fb28c2d81e34710a1678cacb6954a 100644 (file)
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -77,7 +77,7 @@ class CommandGunloadmodule : public Command
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                if (!ServerInstance->Config->ConfValue("security")->getBool("allowcoreunload") &&
-                       InspIRCd::Match(parameters[0], "cmd_*.so", ascii_case_insensitive_map))
+                       InspIRCd::Match(parameters[0], "core_*.so", ascii_case_insensitive_map))
                {
                        user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s :You cannot unload core commands!", parameters[0].c_str());
                        return CMD_FAILURE;
@@ -153,7 +153,12 @@ class CommandGreloadmodule : public Command
                {
                        Module* m = ServerInstance->Modules->Find(parameters[0]);
                        if (m)
-                               ServerInstance->Modules->Reload(m, new GReloadModuleWorker(user->nick, user->uuid, parameters[0]));
+                       {
+                               GReloadModuleWorker* worker = NULL;
+                               if (m != creator)
+                                       worker = new GReloadModuleWorker(user->nick, user->uuid, parameters[0]);
+                               ServerInstance->Modules->Reload(m, worker);
+                       }
                        else
                        {
                                user->WriteNumeric(RPL_LOADEDMODULE, "%s :Could not find module by that name", parameters[0].c_str());