Forge FIDENT reply to CHGIDENT to prevent ident desync with 1.2 and 2.0 servers

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

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index 1fcf3aa566b2f246288a45e5a768a57e8467ccd6..40bced74a211b89eab9ba4190583812108c938fa 100644 (file)
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -44,6 +44,8 @@ bool ModuleManager::Load(const char* filename)
                        dirent* entry = NULL;
                        while (0 != (entry = readdir(library)))
                        {
+                               if (entry->d_name[0] == '.')
+                                       continue;
                                if (InspIRCd::Match(entry->d_name, filename, ascii_case_insensitive_map))
                                {
                                        if (!this->Load(entry->d_name))
@@ -88,11 +90,10 @@ bool ModuleManager::Load(const char* filename)
                {
                        newmod->ModuleSourceFile = filename_str;
                        newmod->ModuleDLLManager = newhandle;
-                       Version v = newmod->GetVersion();
                        Modules[filename_str] = newmod;
-
                        newmod->init();
 
+                       Version v = newmod->GetVersion();
                        ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (Module version %s)%s",
                                filename, newhandle->GetVersion().c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
                }
@@ -168,7 +169,8 @@ namespace {
                        ServerInstance->GlobalCulls.Apply();
                        delete dll;
                        bool rv = ServerInstance->Modules->Load(name.c_str());
-                       callback->Call(rv);
+                       if (callback)
+                               callback->Call(rv);
                        ServerInstance->GlobalCulls.AddItem(this);
                }
        };