diff options
| -rw-r--r-- | source3/include/smb.h | 2 | ||||
| -rw-r--r-- | source3/lib/module.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 65a75420fc..42b8113e59 100644 --- a/source3/include/smb.h +++ b/source3/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/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 */ |