Merge pull request #1000 from ShutterQuick/master+281

[user/henk/code/inspircd.git] / src / modmanager_dynamic.cpp

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index de2593d7236e50946fdf87a93718debca05a438c..184013a4e0db3777957a85c9a636fe3fb6fbe5e5 100644 (file)
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -18,10 +18,6 @@
 
 
 #include "inspircd.h"
-#include "xline.h"
-#include "socket.h"
-#include "socketengine.h"
-#include "command_parse.h"
 #include "exitcodes.h"
 #include <iostream>
 
@@ -39,7 +35,7 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 
        const std::string moduleFile = ServerInstance->Config->Paths.PrependModule(filename);
 
-       if (!ServerConfig::FileExists(moduleFile.c_str()))
+       if (!FileSystem::FileExists(moduleFile))
        {
                LastModuleError = "Module file could not be found: " + filename;
                ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
@@ -136,7 +132,7 @@ void ModuleManager::LoadCoreModules(std::map<std::string, ServiceList>& servicem
                dirent* entry = NULL;
                while (0 != (entry = readdir(library)))
                {
-                       if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map))
+                       if (InspIRCd::Match(entry->d_name, "core_*.so", ascii_case_insensitive_map))
                        {
                                std::cout << ".";
                                fflush(stdout);