From c5609919b67d81a7a8327cde53e88849d5c1bff0 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Tue, 18 May 2010 17:47:05 +0200 Subject: [PATCH] Switch to lt_dlopenadvise() so back_perl can be opened with RTLD_GLOBAL. Open all modules with RTLD_GLOBAL, needed so that back_perl can load non-trivial Perl extensions that require symbols from back_perl.so itself. Bug-Debian: http://bugs.debian.org/327585 Gbp-Pq: Name switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.diff --- servers/slapd/module.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/servers/slapd/module.c b/servers/slapd/module.c index 048ce8d3..81e010ac 100644 --- a/servers/slapd/module.c +++ b/servers/slapd/module.c @@ -117,6 +117,20 @@ int module_unload( const char *file_name ) return -1; /* not found */ } +static lt_dlhandle slapd_lt_dlopenext_global( const char *filename ) +{ + lt_dlhandle handle = 0; + lt_dladvise advise; + + if (!lt_dladvise_init (&advise) && !lt_dladvise_ext (&advise) + && !lt_dladvise_global (&advise)) + handle = lt_dlopenadvise (filename, advise); + + lt_dladvise_destroy (&advise); + + return handle; +} + int module_load(const char* file_name, int argc, char *argv[]) { module_loaded_t *module; @@ -179,7 +193,7 @@ int module_load(const char* file_name, int argc, char *argv[]) * to calling Debug. This is because Debug is a macro that expands * into multiple function calls. */ - if ((module->lib = lt_dlopenext(file)) == NULL) { + if ((module->lib = slapd_lt_dlopenext_global(file)) == NULL) { error = lt_dlerror(); #ifdef HAVE_EBCDIC strcpy( ebuf, error ); -- 2.30.2