Switch to lt_dlopenadvise() so back_perl can be opened with RTLD_GLOBAL. Open all...

Bug-Debian: http://bugs.debian.org/327585

Gbp-Pq: Name switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.diff

diff --git a/servers/slapd/module.c b/servers/slapd/module.c
index c775a2868319ff0141f6b66889cc568afd6e8e92..db5641e3adde34ad8f34050371a1d48df48adf64 100644 (file)
--- 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;
@@ -180,7 +194,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 );