[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-478-g94e6796

[Chris B. <buc...@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 has been updated
       via  94e6796ef3835ad9b7aa03e349369b8861bab5a6 (commit)
       via  e3838be22ce623beb11c037cedea62e0e2dfc110 (commit)
      from  47a012a39e77ebfda24d14f97a53571aea902e40 (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 94e6796ef3835ad9b7aa03e349369b8861bab5a6
Merge: e3838be 47a012a
Author: buccella <buc...@li...>
Date:   Thu Sep 26 15:32:53 2013 -0400

    Merge branch 'master' of ssh://git.code.sf.net/p/sblim/sfcb

commit e3838be22ce623beb11c037cedea62e0e2dfc110
Author: buccella <buc...@li...>
Date:   Thu Sep 26 15:32:06 2013 -0400

    [sfcb-tix#80] sfcc cannot reconnect with sfcb

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

Summary of changes:
 cimcClientSfcbLocal.c |    6 ++----
 contributions.txt     |    4 ++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cimcClientSfcbLocal.c b/cimcClientSfcbLocal.c
index 145e4f5..806306c 100644
--- a/cimcClientSfcbLocal.c
+++ b/cimcClientSfcbLocal.c
@@ -1866,8 +1866,7 @@ static pthread_mutex_t lcc_mutex = PTHREAD_MUTEX_INITIALIZER;
 int
 localConnect(ClientEnv *ce, CMPIStatus *st)
 {
-  static struct sockaddr_un serverAddr;
-  serverAddr.sun_path[0] = '\0';
+  static struct sockaddr_un serverAddr = {AF_UNIX, {'\0'}};
   int             sock,
                   rc = 0,
       sfcbSocket;
@@ -1914,8 +1913,7 @@ localConnect(ClientEnv *ce, CMPIStatus *st)
       }
     }
 
-    serverAddr.sun_family = AF_UNIX;
-    if (serverAddr.sun_path == '\0')
+    if (serverAddr.sun_path[0] == '\0')
       strcpy(serverAddr.sun_path, socketName);
 
     if (connect(sock, (struct sockaddr *) &serverAddr,
diff --git a/contributions.txt b/contributions.txt
index 1136eac..fb85a66 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -231,3 +231,7 @@ Jan Safranek, Red Hat
 05/16/2013 [sfcb-tix:#37] indCIMXmlHandler coredumps in IndCIMXMLHandlerInvokeMethod with Embedded Instances
 05/17/2013 [sfcb-tix:#44] Escape XML for Embedded Instances Instead of Using CDATA
 04/08/2013 [sfcb-tix:#48] mofc: Allow absoltute paths in #pragma include
+
+Rusty Peng
+----------
+09/26/2013 [sfcb-tix:#80] sfcc cannot reconnect with sfcb


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