From: pk910 <philipp@zoelle1.de>
Date: Thu, 16 Feb 2012 12:01:08 +0000 (+0100)
Subject: search modules locally
X-Git-Tag: v5.4~48
X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=commitdiff_plain;h=212bc9398e7a32d2aeeeef3864cf88b59a77a25b

search modules locally
---

diff --git a/src/modules.c b/src/modules.c
index aca36d0..adbe37d 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -282,13 +282,17 @@ struct ModuleInfo *loadModule(char *name) {
     #ifndef WIN32
     sprintf(fname, "%s.so", name);
     void* module = dlopen(fname, RTLD_LAZY);
+    if(!module) {
+        sprintf(fname, "./%s.so", name);
+        module = dlopen(fname, RTLD_LAZY);
+    }
     if(!module) {
         sprintf(fname, ".libs/%s.so", name);
         module = dlopen(fname, RTLD_LAZY);
-        if(!module) {
-            putlog(LOGLEVEL_ERROR, "Error loading module '%s': %s not found.\n", name, fname);
-            return NULL;
-        }
+    }
+    if(!module) {
+        putlog(LOGLEVEL_ERROR, "Error loading module '%s': %s not found.\n", name, fname);
+        return NULL;
     }
     void* initfunc = dlsym(module, "init_module");
     void* startfunc = dlsym(module, "start_module");