From 04d21551e17a871f3d71d0bc66b9a8d25cecc2fb Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 30 Oct 2002 12:07:49 +0000 Subject: - Remove RTLD_GLOBAL - make smb_load_module() return the return value of init_module() (This used to be commit a8d2dd8d009797486105188f8fdb898a65bb25b0) --- source3/lib/module.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source3/lib/module.c') diff --git a/source3/lib/module.c b/source3/lib/module.c index e4d22e0bb7..0953f53ad3 100644 --- a/source3/lib/module.c +++ b/source3/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 */ -- cgit