[maemo-commits] [maemo-commits] r12121 - in projects/haf/trunk/libosso: . debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-06-06 10:10:44 +0300 (Wed, 06 Jun 2007)
New Revision: 12121

Modified:
   projects/haf/trunk/libosso/ChangeLog
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/src/osso-cp-plugin.c
Log:
fixed an issue in plugin dlopen code


Modified: projects/haf/trunk/libosso/ChangeLog
===================================================================
--- projects/haf/trunk/libosso/ChangeLog	2007-06-05 20:49:37 UTC (rev 12120)
+++ projects/haf/trunk/libosso/ChangeLog	2007-06-06 07:10:44 UTC (rev 12121)
@@ -1,3 +1,10 @@
+2007-06-05  Johan Bilien <johan.bilien at nokia.com>
+
+	* src/osso-cp-plugin.c:
+	- use RTLD_LOCAL in dlopen to avoid conflict of symbols
+	in opened plugins, now that we keep the plugins resident.
+	Fixes: NB#59489
+
 2007-03-28  Johan Bilien <johan.bilien at nokia.com>
 
 	* src/osso-internal.h: replaced GArray *cp_plugins with

Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2007-06-05 20:49:37 UTC (rev 12120)
+++ projects/haf/trunk/libosso/debian/changelog	2007-06-06 07:10:44 UTC (rev 12121)
@@ -1,3 +1,10 @@
+libosso (2.11-1) unstable; urgency=low
+
+  * UNRELEASED
+  * Fixed problem in plugin dlopen code. Fixes: NB#59489
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 06 Jun 2007 10:06:44 +0300
+
 libosso (2.10-1) unstable; urgency=low
 
   * Removed deprecated launch banner code.

Modified: projects/haf/trunk/libosso/src/osso-cp-plugin.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-cp-plugin.c	2007-06-05 20:49:37 UTC (rev 12120)
+++ projects/haf/trunk/libosso/src/osso-cp-plugin.c	2007-06-06 07:10:44 UTC (rev 12121)
@@ -101,7 +101,7 @@
   if (handle)
     return handle;
 
-  handle = dlopen (libname, RTLD_LAZY | RTLD_GLOBAL);
+  handle = dlopen (libname, RTLD_LAZY | RTLD_LOCAL);
   if (handle == NULL)
     {
       ULOG_ERR_F("Unable to load library '%s': %s", libname, dlerror());