[Sblim-commit] sfcb ChangeLog, 1.805, 1.806 NEWS, 1.720, 1.721 providerDrv.c, 1.120, 1.121

[Michael Chase-S. <mc...@us...>]

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv3615

Modified Files:
	ChangeLog NEWS providerDrv.c 
Log Message:
[ 3580137 ] Classname needed in *ActivateFilter


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.720
retrieving revision 1.721
diff -u -d -r1.720 -r1.721
--- NEWS	31 Oct 2012 01:40:09 -0000	1.720
+++ NEWS	1 Nov 2012 16:32:51 -0000	1.721
@@ -21,6 +21,7 @@
 - 3574936 --disable-debug still allocates trace variables
 - 3579637 SFCB should check ftok return code
 - 3582062 Various additional error checking
+- 3580137 Classname needed in *ActivateFilter
 
 Changes in 1.3.15
 =================

Index: providerDrv.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerDrv.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- providerDrv.c	6 Oct 2012 01:19:15 -0000	1.120
+++ providerDrv.c	1 Nov 2012 16:32:51 -0000	1.121
@@ -2307,6 +2307,9 @@
    CMPIStatus rci = { CMPI_RC_OK, NULL };
    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;
@@ -2366,11 +2369,11 @@
      authorizeFilterPreV1 fptr = 
        (authorizeFilterPreV1)info->indicationMI->ft->authorizeFilter;
      rci = fptr(info->indicationMI, ctx, result,
-		(CMPISelectExp*)se, type, path,
+		(CMPISelectExp*)se, cns, path,
 		PROVCHARS(req->principal.data));
    } else {
      rci = info->indicationMI->ft->authorizeFilter(info->indicationMI, ctx,
-						   (CMPISelectExp*)se, type, path,
+						   (CMPISelectExp*)se, cns, path,
 						   PROVCHARS(req->principal.data));
    }
    TIMING_STOP(hdr,info)
@@ -2386,7 +2389,7 @@
 		   (CMPISelectExp*)se, type, path);
       } else {
 	rci = info->indicationMI->ft->mustPoll(info->indicationMI, ctx, 
-                                               (CMPISelectExp*)se, type, path);
+                                               (CMPISelectExp*)se, cns, path);
       }
       TIMING_STOP(hdr,info)
       _SFCB_TRACE(1, ("--- Back from provider rc: %d", rci.rc));
@@ -2400,7 +2403,7 @@
 	       (CMPISelectExp*)se, type, path, 1);
       } else {
 	rci = info->indicationMI->ft->activateFilter(info->indicationMI, ctx,
-						     (CMPISelectExp*)se, type, path, 1);
+						     (CMPISelectExp*)se, cns, path, 1);
       }
       TIMING_STOP(hdr,info)
       _SFCB_TRACE(1, ("--- Back from provider rc: %d", rci.rc));
@@ -2436,6 +2439,9 @@
    CMPIStatus rci = { CMPI_RC_OK, NULL };
    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;
@@ -2470,7 +2476,7 @@
 		  (CMPISelectExp*)se, "", path, 1);
 	 } else {
 	   rci = info->indicationMI->ft->deActivateFilter(info->indicationMI, ctx,
-							  (CMPISelectExp*)se, "", path, 1);
+							  (CMPISelectExp*)se, cns, path, 1);
 	 }
 	 TIMING_STOP(hdr,info)
          if (rci.rc==CMPI_RC_OK) {

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.805
retrieving revision 1.806
diff -u -d -r1.805 -r1.806
--- ChangeLog	31 Oct 2012 01:40:09 -0000	1.805
+++ ChangeLog	1 Nov 2012 16:32:51 -0000	1.806
@@ -1,3 +1,8 @@
+2012-11-01 Michael Chase-Salerno <br...@li...>
+
+	* providerDrv.c, cmpiTestIndicationProvider.c:
+	[ 3580137 ] Classname needed in *ActivateFilter
+
 2012-10-30  Chris Buccella  <buc...@li...>
 
 	* instance.c, brokerUpc.c: