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

[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 has been updated
       via  ccaea0a9c9b39f4aa712f335d19e82f511322af7 (commit)
      from  0ceee64c934e907609205af5049afbf67ebd26cd (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 ccaea0a9c9b39f4aa712f335d19e82f511322af7
Author: Dave Heller <hel...@us...>
Date:   Thu Mar 14 17:49:04 2013 -0400

     [sfcb-tix:#2] Problem with PropertyList on association classes

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

Summary of changes:
 cimXmlOps.y |   53 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/cimXmlOps.y b/cimXmlOps.y
index 09cacbf..9d5e236 100644
--- a/cimXmlOps.y
+++ b/cimXmlOps.y
@@ -956,13 +956,13 @@ buildReferencesRequest(void *parm)
   if (req->objectName.bindings.next == 0) {
     free(sreq);
     hdr->rc = CMPI_RC_ERR_NOT_SUPPORTED;
-    hdr->errMsg = "References operation for classes not supported";
+    hdr->errMsg = strdup("References operation for classes not supported");
     return;
   }
   if (!req->objNameSet) {
     free(sreq);
     hdr->rc = CMPI_RC_ERR_INVALID_PARAMETER;
-    hdr->errMsg = "ObjectName parameter required";
+    hdr->errMsg = strdup("ObjectName parameter required");
     return;
   }
 
@@ -1024,12 +1024,12 @@ buildReferenceNamesRequest(void *parm)
 
   if (req->objectName.bindings.next == 0) {
     hdr->rc = CMPI_RC_ERR_NOT_SUPPORTED;
-    hdr->errMsg = "ReferenceNames operation for classes not supported";
+    hdr->errMsg = strdup("ReferenceNames operation for classes not supported");
     return;
   }
   if (!req->objNameSet) {
     hdr->rc = CMPI_RC_ERR_INVALID_PARAMETER;
-    hdr->errMsg = "ObjectName parameter required";
+    hdr->errMsg = strdup("ObjectName parameter required");
     return;
   }
 
@@ -3429,6 +3429,20 @@ associatorsParms
        $$.properties=0;
        $$.propertyList.values=0;
     }
+    | XTOK_IP_OBJECTNAME className ZTOK_IPARAMVALUE
+    {
+       // This is an unsupported operation. To ensure we handle with a friendly
+       // error message, make it appear as if INSTANCENAME with no KEYBINDING
+       // was passed in the XML.
+       $$.objectName.className = $2;
+       $$.objectName.bindings.next=0;
+       $$.objectName.bindings.keyBindings=NULL;
+       $$.objNameSet = 1;
+       $$.flags = $$.flagsSet = 0;
+       $$.resultClass=$$.role=0;
+       $$.properties=0;
+       $$.propertyList.values=0;
+    }
     | XTOK_IP_ASSOCCLASS className ZTOK_IPARAMVALUE
     {
        $$.assocClass = $2;
@@ -3590,7 +3604,7 @@ referencesParmsList
           $$.propertyList=$2.propertyList;
           $$.properties=$2.properties;
        }
-    }
+   }
 ;
 
 referencesParms
@@ -3603,6 +3617,17 @@ referencesParms
        $$.properties=0;
        $$.propertyList.values=0;
     }
+    | XTOK_IP_OBJECTNAME className ZTOK_IPARAMVALUE
+    {
+       $$.objectName.className = $2;
+       $$.objectName.bindings.next=0;
+       $$.objectName.bindings.keyBindings=NULL;
+       $$.objNameSet = 1;
+       $$.flags = $$.flagsSet = 0;
+       $$.resultClass=$$.role=0;
+       $$.properties=0;
+       $$.propertyList.values=0;
+    }
     | XTOK_IP_RESULTCLASS className ZTOK_IPARAMVALUE
     {
        $$.resultClass = $2;
@@ -3610,7 +3635,7 @@ referencesParms
        $$.role=0;
        $$.properties=0;
        $$.propertyList.values=0;
-    }
+   }
     | XTOK_IP_RESULTCLASS ZTOK_IPARAMVALUE
     {
        memset(&$$, 0, sizeof($$));
@@ -3737,6 +3762,14 @@ associatorNamesParms
        $$.objNameSet = 1;
        $$.assocClass=$$.resultClass=$$.role=$$.resultRole=0;
     }
+    | XTOK_IP_OBJECTNAME className ZTOK_IPARAMVALUE
+    {
+       $$.objectName.className = $2;
+       $$.objectName.bindings.next=0;
+       $$.objectName.bindings.keyBindings=NULL;
+       $$.objNameSet = 1;
+       $$.resultClass=$$.role=0;
+    }
     | XTOK_IP_ASSOCCLASS className ZTOK_IPARAMVALUE
     {
        $$.assocClass = $2;
@@ -3844,6 +3877,14 @@ referenceNamesParms
        $$.objNameSet = 1;
        $$.resultClass=$$.role=0;
     }
+    | XTOK_IP_OBJECTNAME className ZTOK_IPARAMVALUE
+    {
+       $$.objectName.className = $2;
+       $$.objectName.bindings.next=0;
+       $$.objectName.bindings.keyBindings=NULL;
+       $$.objNameSet = 1;
+       $$.resultClass=$$.role=0;
+    }
     | XTOK_IP_RESULTCLASS className ZTOK_IPARAMVALUE
     {
        $$.resultClass = $2;


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