X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodmanager_static.cpp;h=4de111b63ae44e303b906f069915e609a52f5d52;hb=7ece928bab20881d6fe24c4479f4ff9e0a8a7179;hp=ac127b7031b2d5f0e8a61ec56f111396a2e4a3c3;hpb=3a3ff949670c61a4a8856e1391222e156eb1cd17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index ac127b703..4de111b63 100644
--- a/src/modmanager_static.cpp
+++ b/src/modmanager_static.cpp
@@ -17,13 +17,13 @@
  */
 
 
-#define MODNAME "cmd_all"
+#define MODNAME "core_all"
 
 #include "inspircd.h"
 #include "exitcodes.h"
 #include <iostream>
 
-#ifdef PURE_STATIC
+#ifdef INSPIRCD_STATIC
 
 typedef std::map<std::string, AllModuleList*> modmap;
 static std::vector<AllCommandList::fn>* cmdlist = NULL;
@@ -72,7 +72,7 @@ class AllModule : public Module
 		stdalgo::delete_all(cmds);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("All commands", VF_VENDOR|VF_CORE);
 	}
@@ -80,8 +80,9 @@ class AllModule : public Module
 
 MODULE_INIT(AllModule)
 
-bool ModuleManager::Load(const std::string& name, bool defer)
+bool ModuleManager::Load(const std::string& inputname, bool defer)
 {
+	const std::string name = ExpandModName(inputname);
 	modmap::iterator it = modlist->find(name);
 	if (it == modlist->end())
 		return false;
@@ -135,7 +136,7 @@ void ModuleManager::LoadCoreModules(std::map<std::string, ServiceList>& servicem
 	for (modmap::const_iterator i = modlist->begin(); i != modlist->end(); ++i)
 	{
 		const std::string modname = i->first;
-		if (modname[0] == 'c')
+		if (InspIRCd::Match(modname, "core_*.so", ascii_case_insensitive_map))
 		{
 			this->NewServices = &servicemap[modname];
 			Load(modname, true);