- Remove RTLD_GLOBAL

- make smb_load_module() return the return value of init_module()

diff --git a/source/include/smb.h b/source/include/smb.h
index 65a75420fca603e8cd2d3e53dbba24c267c13dc4..42b8113e5904c32831ae5f33c0b695bf6096afee 100644 (file)
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -1698,6 +1698,6 @@ extern struct poptOption popt_common_debug[];
 extern struct poptOption popt_common_configfile[];
 
 /* Module support */
-typedef int (init_module_function) (void);
+typedef NTSTATUS (init_module_function) (void);
 
 #endif /* _SMB_H */

diff --git a/source/lib/module.c b/source/lib/module.c
index e4d22e0bb7d1f0af75480aa24b627bc79d14dc61..0953f53ad3eee9dcc47b20ad47d25529ed337185 100644 (file)
--- a/source/lib/module.c
+++ b/source/lib/module.c
@@ -26,12 +26,13 @@ NTSTATUS smb_load_module(const char *module_name)
 {
        void *handle;
        init_module_function *init;
+       NTSTATUS nt_status;
 
        /* Always try to use LAZY symbol resolving; if the plugin has 
         * backwards compatibility, there might be symbols in the 
         * plugin referencing to old (removed) functions
         */
-       handle = dlopen(module_name, RTLD_LAZY | RTLD_GLOBAL);
+       handle = dlopen(module_name, RTLD_LAZY);
 
        if(!handle) {
                DEBUG(0, ("Error loading module '%s': %s\n", module_name, sys_dlerror()));
@@ -45,11 +46,11 @@ NTSTATUS smb_load_module(const char *module_name)
                return NT_STATUS_UNSUCCESSFUL;
        }
 
-       init();
+       nt_status = init();
 
        DEBUG(2, ("Module '%s' loaded\n", module_name));
 
-       return NT_STATUS_OK;
+       return nt_status;
 }
 
 #else /* HAVE_DLOPEN */