[Sblim-commit] sfcb ChangeLog, 1.813, 1.814 NEWS, 1.729, 1.730 contributions.txt, 1.74, 1.75 support.c, 1.42, 1.43

[Dave H. <hel...@us...>]

Update of /cvsroot/sblim/sfcb
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7214

Modified Files:
	ChangeLog NEWS contributions.txt support.c 
Log Message:
[ 3599329 ] dlopen failed for sfcbCustomLib

Index: support.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/support.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- support.c	19 Jul 2012 17:21:22 -0000	1.42
+++ support.c	7 Jan 2013 15:55:17 -0000	1.43
@@ -1039,38 +1039,43 @@
 
   hostnameLib = NULL;
   if (getControlChars("sfcbCustomLib", &ln) == 0) {
-     libraryName(NULL, ln, dlName, 512);
-     if ((hostnameLib = dlopen(dlName, RTLD_LAZY))) {
-        dlerror();
-        sfcbHostname = dlsym(hostnameLib, "_sfcbGetResponseHostname");
-	if ((err = dlerror()) != NULL) {
-	   printf("dlsym failed for _sfcbGetResponseHostname: %s\n", err);
-           dlclose(hostnameLib);
-	   return -1;
-        }
-        dlerror();
-	sfcbSlpHostname = dlsym(hostnameLib, "_sfcGetSlpHostname");
-	if ((err = dlerror()) != NULL) {
-	   printf("dlsym failed for _sfcbGetSlpHostname: %s\n", err);
-           dlclose(hostnameLib);
-	   return -1;
-        }
-        dlerror();
-        indAuditLog = dlsym(hostnameLib, "_sfcbIndAuditLog");
-        if ((err = dlerror()) != NULL) {
-           printf("dlsym failed for _sfcbIndAuditLog: %s\n", err);
-           dlclose(hostnameLib);
-           return -1;
-        }
-     }
-     else {
-	   printf("dlopen failed for sfcbCustomLib\n");
-	   return -1;
-     }
+    libraryName(NULL, ln, dlName, 512);
+    hostnameLib = dlopen(dlName, RTLD_LAZY);
+    if (!hostnameLib) {
+      libraryName(SFCB_LIBDIR, ln, dlName, 512);
+      hostnameLib = dlopen(dlName, RTLD_LAZY);
+    }
+    if (hostnameLib) {
+      dlerror();
+      sfcbHostname = dlsym(hostnameLib, "_sfcbGetResponseHostname");
+      if ((err = dlerror()) != NULL) {
+        printf("dlsym failed for _sfcbGetResponseHostname: %s\n", err);
+        dlclose(hostnameLib);
+        return -1;
+      }
+      dlerror();
+      sfcbSlpHostname = dlsym(hostnameLib, "_sfcGetSlpHostname");
+      if ((err = dlerror()) != NULL) {
+        printf("dlsym failed for _sfcbGetSlpHostname: %s\n", err);
+        dlclose(hostnameLib);
+        return -1;
+      }
+      dlerror();
+      indAuditLog = dlsym(hostnameLib, "_sfcbIndAuditLog");
+      if ((err = dlerror()) != NULL) {
+        printf("dlsym failed for _sfcbIndAuditLog: %s\n", err);
+        dlclose(hostnameLib);
+        return -1;
+      }
+    }
+    else {
+      printf("dlopen failed for sfcbCustomLib\n");
+      return -1;
+    }
   }
   else {
-       printf("Cannot find the libary to open: %s\n", ln);
-       return -1;
+    printf("Cannot find the libary to open: %s\n", ln);
+    return -1;
   }
 
   return 0;

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.813
retrieving revision 1.814
diff -u -d -r1.813 -r1.814
--- ChangeLog	12 Dec 2012 22:09:30 -0000	1.813
+++ ChangeLog	7 Jan 2013 15:55:17 -0000	1.814
@@ -1,3 +1,8 @@
+2013-01-07  Dave Heller <hel...@us...>
+
+	* support.c
+	[ 3599329 ] dlopen failed for sfcbCustomLib
+
 2012-12-12  Chris Buccella  <buc...@li...>
 
 	* cimXmlGen.c, cimXmlParser.c, cimXmlParser.h, cimXmlRequest.c,

Index: contributions.txt
===================================================================
RCS file: /cvsroot/sblim/sfcb/contributions.txt,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- contributions.txt	16 Nov 2012 17:27:46 -0000	1.74
+++ contributions.txt	7 Jan 2013 15:55:17 -0000	1.75
@@ -116,6 +116,7 @@
 09/30/2011 [ 3416055 ] SIGSEGV sometimes does not print provider name
 03/29/2012 [ 3441028 ] sblim-sfcb fails on large https requests
 03/29/2012 [ 3416054 ] Provider continues despite SIGSEGV
+01/05/2013 [ 3599329 ] dlopen failed for sfcbCustomLib
 
 Mike Brasher, Inova
 -------------------

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.729
retrieving revision 1.730
diff -u -d -r1.729 -r1.730
--- NEWS	21 Dec 2012 22:48:55 -0000	1.729
+++ NEWS	7 Jan 2013 15:55:17 -0000	1.730
@@ -3,7 +3,7 @@
 New features: 
 
 Bugs fixed:
-
+- 3599329 dlopen failed for sfcbCustomLib
 
 Changes in 1.3.16
 =================