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

diff --git a/lib/module.c b/lib/module.c
index 7d9c91c5b46e1dc2ac3d4a9f4d76cd0a1fae5794..67b6aff15c47c51816d017704b5c04e31392bfc8 100644 (file)
--- 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 92ab3a1977834f4f2927cac0d7fcb7f831e411ad..29afc9884966136023c5c03a74af185cdbb09f18 100644 (file)
--- 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