sblim-commit

[Michael Chase-S. <mc...@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  caa3f72ffff85d7dc5e265c70c81f3840ac8fe5a (commit)
      from  2440f3bb0a6faa9772d596c34d36328abad662fe (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 caa3f72ffff85d7dc5e265c70c81f3840ac8fe5a
Author: Michael Chase-Salerno <br...@li...>
Date:   Thu Nov 1 17:29:34 2012 -0400

    [ 3580137 ] Classname needed in *ActivateFilter

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

Summary of changes:
diff --git a/NEWS b/NEWS
index 5630194..11e3545 100644
--- a/NEWS
+++ b/NEWS
@@ -119,6 +119,7 @@ Bugs fixed:
 - 3574169 revert interop2 stageschema
 - 3574936 --disable-debug still allocates trace variables
 - 3582062 Various additional error checking
+- 3580137 Classname needed in *ActivateFilter
 
 Changes in 1.3.15
 =================
diff --git a/providerDrv.c b/providerDrv.c
index 03a10cd..d078fa8 100644
--- a/providerDrv.c
+++ b/providerDrv.c
@@ -2681,6 +2681,9 @@ activateFilter(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
       *prev = NULL;
   CMPIObjectPath *path =
       relocateSerializedObjectPath(req->objectPath.data);
+  // Get the string of the classname
+  CMPIString *cn = path->ft->getClassName(path,NULL);
+  const char *cns = cn->ft->getCharPtr(cn,NULL);
   CMPIContext    *ctx = native_new_CMPIContext(MEM_TRACKED, info);
   CMPIResult     *result = native_new_CMPIResult(0, 1, NULL);
   CMPIFlags       flgs = 0;
@@ -2750,7 +2753,7 @@ activateFilter(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
   } else {
     rci = info->indicationMI->ft->authorizeFilter(info->indicationMI, ctx,
                                                   (CMPISelectExp *) se,
-                                                  type, path,
+                                                  cns, path,
                                                   PROVCHARS(req->principal.
                                                             data));
   }
@@ -2767,7 +2770,7 @@ activateFilter(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
                  (CMPISelectExp *) se, type, path);
     } else {
       rci = info->indicationMI->ft->mustPoll(info->indicationMI, ctx,
-                                             (CMPISelectExp *) se, type,
+                                             (CMPISelectExp *) se, cns,
                                              path);
     }
     TIMING_STOP(hdr, info)
@@ -2783,7 +2786,7 @@ activateFilter(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
     } else {
       rci = info->indicationMI->ft->activateFilter(info->indicationMI, ctx,
                                                    (CMPISelectExp *) se,
-                                                   type, path, 1);
+                                                   cns, path, 1);
     }
     TIMING_STOP(hdr, info)
         _SFCB_TRACE(1, ("--- Back from provider rc: %d", rci.rc));
@@ -2819,6 +2822,9 @@ deactivateFilter(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
   NativeSelectExp *se = NULL, *prev = NULL;
   CMPIObjectPath *path =
       relocateSerializedObjectPath(req->objectPath.data);
+  // Get the string of the classname
+  CMPIString *cn = path->ft->getClassName(path,NULL);
+  const char *cns = cn->ft->getCharPtr(cn,NULL);
   CMPIContext    *ctx = native_new_CMPIContext(MEM_TRACKED, info);
   CMPIResult     *result = native_new_CMPIResult(0, 1, NULL);
   CMPIFlags       flgs = 0;
@@ -2867,7 +2873,7 @@ deactivateFilter(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
             info->indicationMI->ft->deActivateFilter(info->indicationMI,
                                                      ctx,
                                                      (CMPISelectExp *) se,
-                                                     "", path, 1);
+                                                     cns, path, 1);
       }
       TIMING_STOP(hdr, info)
       if (rci.rc == CMPI_RC_OK) {
diff --git a/test/TestProviders/cmpiTestIndicationProvider.c b/test/TestProviders/cmpiTestIndicationProvider.c
index 629ba7f..348aef8 100644
--- a/test/TestProviders/cmpiTestIndicationProvider.c
+++ b/test/TestProviders/cmpiTestIndicationProvider.c
@@ -139,17 +139,21 @@ indProvIndicationCleanup(CMPIIndicationMI * cThis, const CMPIContext *ctx,
 
 CMPIStatus      indProvAuthorizeFilter
     (CMPIIndicationMI * cThis, const CMPIContext *ctx,
-     const CMPISelectExp *filter, const char *indType,
+     const CMPISelectExp *filter, const char *clsName,
      const CMPIObjectPath * classPath, const char *owner) {
 
+  char* op = CMGetCharPtr(CMObjectPathToString(classPath, NULL));
+  fprintf (stderr, "+++ indProvAuthorizeFilter for %s %s\n", op, clsName);
   CMReturn(CMPI_RC_OK);
 }
 
 CMPIStatus      indProvMustPoll
     (CMPIIndicationMI * cThis, const CMPIContext *ctx,
-     const CMPISelectExp *filter, const char *indType,
+     const CMPISelectExp *filter, const char *clsName,
      const CMPIObjectPath * classPath) {
 
+  char* op = CMGetCharPtr(CMObjectPathToString(classPath, NULL));
+  fprintf (stderr, "+++ indProvMustPoll for %s %s\n", op, clsName);
   CMReturn(CMPI_RC_OK);
 }
 
@@ -159,7 +163,7 @@ CMPIStatus      indProvActivateFilter
      const CMPIObjectPath * classPath, CMPIBoolean firstActivation) {
 
   char* op = CMGetCharPtr(CMObjectPathToString(classPath, NULL));
-  fprintf (stderr, "+++ indProvActivateFilter() for %s\n", op);
+  fprintf (stderr, "+++ indProvActivateFilter() for %s %s\n", op, clsName);
 
   if (strcmp(op, "root/interop:Test_Indication") == 0)
     activated = 1;
@@ -176,7 +180,7 @@ CMPIStatus      indProvDeActivateFilter
   fprintf(stderr, "+++ indProvDeActivateFilter\n");
 
   char* op = CMGetCharPtr(CMObjectPathToString(classPath, NULL));
-  fprintf (stderr, "+++ indProvDeActivateFilter for %s\n", op);
+  fprintf (stderr, "+++ indProvDeActivateFilter for %s %s\n", op, clsName);
 
   if (strcmp(op, "root/interop:Test_Indication") == 0)
     activated = 0;


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