42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
|
From: Jan-Marek Glogowski <jan-marek.glogowski@muenchen.de>
|
||
|
|
Date: Tue, 18 May 2010 17:47:05 +0200
|
||
|
|
Subject: [PATCH] Switch to lt_dlopenadvise() to get RTLD_GLOBAL set.
|
||
|
|
|
||
|
|
Proof of concept for fixing http://bugs.debian.org/327585
|
||
|
|
(patch ported from freeradius bug http://bugs.debian.org/416266)
|
||
|
|
|
||
|
|
Resolves: #960048
|
||
|
|
---
|
||
|
|
--- openldap/servers/slapd/module.c.orig 2010-05-18 17:42:04.000000000 +0200
|
||
|
|
+++ openldap/servers/slapd/module.c 2010-05-18 17:45:46.000000000 +0200
|
||
|
|
@@ -117,6 +117,20 @@
|
||
|
|
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 @@
|
||
|
|
* 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 );
|