[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-335-g989fee7

[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  989fee789381930e0c78b17bb04ed7e7cfa6abf3 (commit)
       via  5fc760ac1233b8e6a1ff7d135ef0afe145b8be52 (commit)
       via  1f1c2c9b9b9403f4c75d2a0455a5858ebe836a59 (commit)
       via  43bbe00a607b2c9b9e747e8c1ff3e18b5b3fd8b4 (commit)
      from  72beb85ac63b1cb9a46eee59ad18d358f88c252c (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 989fee789381930e0c78b17bb04ed7e7cfa6abf3
Merge: 5fc760a 72beb85
Author: buccella <buc...@li...>
Date:   Wed Nov 21 11:32:51 2012 -0500

    merge NEWS

commit 5fc760ac1233b8e6a1ff7d135ef0afe145b8be52
Author: buccella <buc...@li...>
Date:   Wed Nov 21 11:30:07 2012 -0500

    [ 3452703 ] Default http uid used causes unexpected behavior

commit 1f1c2c9b9b9403f4c75d2a0455a5858ebe836a59
Author: buccella <buc...@li...>
Date:   Tue Nov 20 14:54:36 2012 -0500

    [ 3588775 ] Startup will hang if indication support is disabled

commit 43bbe00a607b2c9b9e747e8c1ff3e18b5b3fd8b4
Author: buccella <buc...@li...>
Date:   Tue Nov 20 12:40:18 2012 -0500

    [ 3588557 ] Object path in deliverIndication can remain resident

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

Summary of changes:
diff --git a/NEWS b/NEWS
index 5355a09..8945966 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ Bugs fixed:
 - 3579637 SFCB should check ftok return code
 - 3562530 TestMiscProvider poorly tests CMGetPropertyAt
 - 3585929 Additional ClassProviderSf prep work
+- 3588775 Startup will hang if indication support is disabled
 
 Changes in 1.4.2
 ================
@@ -124,6 +125,8 @@ Bugs fixed:
 - 3580137 Classname needed in *ActivateFilter
 - 3585274 Local connect kills tracing
 - 3528056 sfcbd --version doesn't always work
+- 3588557 Object path in deliverIndication can remain resident
+- 3452703 Default http uid used causes unexpected behavior
 - 3381209 Memory leak inside getClass() used by invokeMethod()
 
 Changes in 1.3.15
diff --git a/brokerUpc.c b/brokerUpc.c
index 2f95867..ec24da3 100644
--- a/brokerUpc.c
+++ b/brokerUpc.c
@@ -166,6 +166,7 @@ deliverIndication(const CMPIBroker * mb, const CMPIContext *ctx,
     classMatch = 0; /* 3483200 */
     se = se->next;
   }
+  CMRelease(indop); /* 3588557 */
 
   _SFCB_RETURN(st);
 #else
diff --git a/httpAdapter.c b/httpAdapter.c
index 333733a..2d0c223 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -2148,7 +2148,9 @@ httpDaemon(int argc, char *argv[], int sslMode)
 
   /* wait until providerMgr is ready to start accepting reqs
      (that is, when interopProvider is finished initializing) */
+#ifdef SFCB_INCL_INDICATION_SUPPORT
   semAcquire(sfcbSem, INIT_PROV_MGR_ID);
+#endif
 
   for (;;) {
 
diff --git a/sfcBroker.c b/sfcBroker.c
index 73c4847..24f8278 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -425,10 +425,7 @@ startHttpd(int argc, char *argv[], int sslMode)
           "--- Error retrieving http user info from config file.\n");
     exit(2);
   }
-  if (httpSFCB) {
-    // This indicates that we should use the SFCB user by default
-    httpuid = -1;
-  } else {
+  if (!httpSFCB) {
     // Get the user specified in the config file
     if (getControlChars("httpUser", &httpUser)) {
       mlogf(M_ERROR, M_SHOW,
@@ -456,7 +453,7 @@ startHttpd(int argc, char *argv[], int sslMode)
   }
   if (pid == 0) {
     currentProc = getpid();
-    if (httpuid != -1) {
+    if (!httpSFCB) {
       // Set the real and effective uids
       rc = setreuid(httpuid, httpuid);
       if (rc == -1) {


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