[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master_1.3, updated. dd9304f041e14c7704c9c2961497c6c79192e325

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".

The branch, master_1.3 has been updated
       via  dd9304f041e14c7704c9c2961497c6c79192e325 (commit)
      from  a0c2813d36260a59080529950524a57787ff3635 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dd9304f041e14c7704c9c2961497c6c79192e325
Author: Dave Heller <hel...@us...>
Date:   Tue Jan 8 09:22:41 2013 -0500

    [ 3599329 ] dlopen failed for sfcbCustomLib

-----------------------------------------------------------------------

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 1ba5665..7c59263 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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,
diff --git a/NEWS b/NEWS
index d9f698d..b7e9fc1 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ Changes in 1.3.17
 New features: 
 
 Bugs fixed:
-
+- 3599329 dlopen failed for sfcbCustomLib
 
 Changes in 1.3.16
 =================
diff --git a/contributions.txt b/contributions.txt
index 1ebbce4..67a53a1 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -116,6 +116,7 @@ Klaus Kampf, Novell
 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
 -------------------
diff --git a/support.c b/support.c
index bab79f0..cdda9fb 100644
--- a/support.c
+++ b/support.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: support.c,v 1.42 2012/07/19 17:21:22 mchasal Exp $
+ * $Id: support.c,v 1.43 2013/01/07 15:55:17 hellerda Exp $
  *
  *  © Copyright IBM Corp. 2005, 2007
  *
@@ -1039,38 +1039,43 @@ int loadHostnameLib()
 
   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;


hooks/post-receive
-- 
SFCB - Small Footprint CIM Broker