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

[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  befeb9d217f804a51bd5536fa47a2f833803c18c (commit)
       via  258fd679beb5f382e3f20d866fc13c26a39267f0 (commit)
      from  56496a5d8e82c3053409f1060f3c1c3fa5baa2af (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 befeb9d217f804a51bd5536fa47a2f833803c18c
Author: buccella <buc...@li...>
Date:   Wed Mar 28 12:06:07 2012 -0400

    [ 3510456 ] GetProperty calls not passing keys to providers

commit 258fd679beb5f382e3f20d866fc13c26a39267f0
Author: buccella <buc...@li...>
Date:   Wed Mar 28 12:00:02 2012 -0400

    [ 3510458 ] Malformed XML response to GetProperty

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index b8973c9..3740b12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-28  Chris Buccella  <buc...@li...>
+
+	* cimXmlOps.y:
+	[ 3510456 ] GetProperty calls not passing keys to providers
+	(patch by Zane Bitter)
+
+	* cimRequest.c:
+	[ 3510458 ] Malformed XML response to GetProperty
+	(patch by Zane Bitter)
+
 2012-03-16 Dave Heller <hel...@us...>
 
 	* control.c, indCIMXMLExport.c, sfcb.cfg.pre.in:
diff --git a/NEWS b/NEWS
index 7abe185..7187ff2 100644
--- a/NEWS
+++ b/NEWS
@@ -122,6 +122,8 @@ Bugs Fixed:
 - 3499930 Check file repository writes
 - 3457460 PAM_RHOST set wrong
 - 3504607 CMPIRole Support in brokerUpc
+- 3510458 Malformed XML response to GetProperty
+- 3510456 GetProperty calls not passing keys to providers
 
 Changes in 1.3.13
 =================
diff --git a/cimRequest.c b/cimRequest.c
index 9f0e0b7..44da6f5 100644
--- a/cimRequest.c
+++ b/cimRequest.c
@@ -1460,7 +1460,6 @@ getProperty(CimRequestContext * ctx, RequestHdr * hdr)
   CMPIInstance   *inst;
   CMPIData        data;
   UtilStringBuffer *sb;
-  CMPIString     *tmpString = NewCMPIString(NULL, NULL);
   int             irc;
   BinResponseHdr *resp;
   RespSegments    rsegs;
@@ -1479,9 +1478,7 @@ getProperty(CimRequestContext * ctx, RequestHdr * hdr)
       inst = relocateSerializedInstance(resp->object[0].data);
       sb = UtilFactory->newStrinBuffer(1024);
       data = inst->ft->getProperty(inst, req->name, NULL);
-      data2xml(&data, NULL, tmpString, NULL, NULL, 0, NULL, 0, sb, NULL, 0,
-               0);
-      CMRelease(tmpString);
+      value2xml(data, sb, 1);
       rsegs = iMethodResponse(hdr, sb);
       if (resp) {
         free(resp);
@@ -1495,11 +1492,9 @@ getProperty(CimRequestContext * ctx, RequestHdr * hdr)
     if (resp) {
       free(resp);
     }
-    CMRelease(tmpString);
     free(hdr->binCtx->bHdr);
     _SFCB_RETURN(rs);
   }
-  CMRelease(tmpString);
   free(hdr->binCtx->bHdr);
   closeProviderContext(hdr->binCtx);
 
diff --git a/cimXmlOps.y b/cimXmlOps.y
index 1891cbd..2903c31 100644
--- a/cimXmlOps.y
+++ b/cimXmlOps.y
@@ -1065,6 +1065,7 @@ buildGetPropertyRequest(void *parm)
   GetPropertyReq  *sreq;//BINREQ(OPS_GetProperty, 3);
   RequestHdr     *hdr = &(((ParserControl *)parm)->reqHdr);
   BinRequestContext *binCtx = hdr->binCtx;
+  int i, m;
 
   _SFCB_ENTER(TRACE_CIMXMLPROC, "buildGetPropertyRequest");
 
@@ -1075,6 +1076,16 @@ buildGetPropertyRequest(void *parm)
   path =
       TrackedCMPIObjectPath(req->op.nameSpace.data,
                             req->instanceName.className, &rc);
+  for (i = 0, m = req->instanceName.bindings.next; i < m; i++) {
+    CMPIType type;
+    CMPIValue val, *valp;
+
+    valp = getKeyValueTypePtr(req->instanceName.bindings.keyBindings[i].type,
+                              req->instanceName.bindings.keyBindings[i].value,
+                              &req->instanceName.bindings.keyBindings[i].ref,
+                              &val, &type, req->op.nameSpace.data);
+    CMAddKey(path, req->instanceName.bindings.keyBindings[i].name, valp, type);
+  }
 
   sreq = calloc(1, sizeof(*sreq));
   sreq->hdr.operation = OPS_GetProperty;
diff --git a/contributions.txt b/contributions.txt
index 90663e0..83f0dda 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -198,3 +198,8 @@ Josef Moellers
 Santosh Bidaralli, Dell
 -----------------------
 06/22/2011 [ 3324578 ] getInstance() up call does not close provider context
+
+Zane Bitter, Red Hat
+--------------------
+03/28/2012 [ 3510458 ] Malformed XML response to GetProperty
+03/28/2012 [ 3510456 ] GetProperty calls not passing keys to providers


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