From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Thu, 25 May 2017 17:38:58 +0000 (+0200)
Subject: module.c: don't fall back to MODULEDIR if overridden
X-Git-Tag: v1.3.0~9^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ad4f88d656ed96839389c268e1c8e5d568be500;p=thirdparty%2Fknot-resolver.git

module.c: don't fall back to MODULEDIR if overridden
---

diff --git a/lib/module.c b/lib/module.c
index 7d9c91c5b..67b6aff15 100644
--- a/lib/module.c
+++ b/lib/module.c
@@ -126,11 +126,9 @@ int kr_module_load(struct kr_module *module, const char *name, const char *path)
 		return kr_error(ENOMEM);
 	}
 
-	/* Search for module library, use current namespace if not found. */
+	/* Search for module library. */
 	if (!path || load_library(module, name, path) != 0) {
-		if (load_library(module, name, MODULEDIR) != 0) {
-			module->lib = RTLD_DEFAULT;
-		}
+		module->lib = RTLD_DEFAULT;
 	}
 
 	/* Try to load module ABI. */
diff --git a/lib/module.h b/lib/module.h
index 92ab3a197..29afc9884 100644
--- a/lib/module.h
+++ b/lib/module.h
@@ -84,7 +84,7 @@ struct kr_prop {
 
 
 /**
- * Load module instance into memory.
+ * Load a C module instance into memory.
  *
  * @param module module structure
  * @param name module name