[Sblim-commit] sfcb providerDrv.c, 1.92, 1.93 ChangeLog, 1.630, 1.631 NEWS, 1.557, 1.558 contributions.txt, 1.56, 1.57

[Chris B. <buc...@us...>]

Update of /cvsroot/sblim/sfcb
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv23513

Modified Files:
	providerDrv.c ChangeLog NEWS contributions.txt 
Log Message:
[ 3101155 ] Failed to load provider libraries due to symbol conflicts

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -d -r1.557 -r1.558
--- NEWS	28 Oct 2010 00:20:05 -0000	1.557
+++ NEWS	8 Nov 2010 19:54:46 -0000	1.558
@@ -5,6 +5,7 @@
 - 3086143 set cmpi status in getPropQualifier
 - 3086145 check datetime format in chars2bin
 - 3095884 Indication classes missing SystemName
+- 3101155 Failed to load provider libraries due to symbol conflicts
 
 Changes in 1.3.9
 ================

Index: providerDrv.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerDrv.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- providerDrv.c	14 Jul 2010 19:09:37 -0000	1.92
+++ providerDrv.c	8 Nov 2010 19:54:45 -0000	1.93
@@ -96,6 +96,10 @@
 
 #endif
 
+#ifndef PROVIDERLOAD_DLFLAG
+#define PROVIDERLOAD_DLFLAG (RTLD_NOW | RTLD_GLOBAL)
+#endif
+
 extern CMPIBroker *Broker;
 
 extern unsigned long exFlags;
@@ -2562,9 +2566,9 @@
    while (dir) {
      libraryName(dir, (char *) info->location, fullname, fullname_max_length);
      if (stat(fullname,&stbuf) == 0) {
-       info->library = dlopen(fullname, RTLD_NOW | RTLD_GLOBAL);
+       info->library = dlopen(fullname, PROVIDERLOAD_DLFLAG);
        if (info->library == NULL) {
-	 mlogf(M_ERROR,M_SHOW,"*** dlopen error: %s\n",dlerror());
+         mlogf(M_ERROR,M_SHOW,"*** dlopen: %s error: %s\n", fullname, dlerror());
        } else {
 	 _SFCB_TRACE(1, ("--- Loaded provider library %s for %s-%d",
 			 fullname,

Index: contributions.txt
===================================================================
RCS file: /cvsroot/sblim/sfcb/contributions.txt,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- contributions.txt	14 Oct 2010 20:59:56 -0000	1.56
+++ contributions.txt	8 Nov 2010 19:54:46 -0000	1.57
@@ -172,3 +172,7 @@
 -----------------
 10/14/2010 [ 3086143 ] set cmpi status in getPropQualifier
 10/14/2010 [ 3086145 ] check datetime format in chars2bin
+
+Chris Poblete, Dell
+-------------------
+11/08/2010 [ 3101155 ] Failed to load provider libraries due to symbol conflicts

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.630
retrieving revision 1.631
diff -u -d -r1.630 -r1.631
--- ChangeLog	28 Oct 2010 00:20:05 -0000	1.630
+++ ChangeLog	8 Nov 2010 19:54:45 -0000	1.631
@@ -1,3 +1,9 @@
+2010-11-08  Chris Buccella  <buc...@li...>
+
+	* providerDrv.c:
+	[ 3101155 ] Failed to load provider libraries due to symbol conflicts
+	(patch by Chris Poblete)
+
 2010-10-27  Chris Buccella  <buc...@li...>
 
 	* interopProvider.c, indCIMXMLHandler.c: