Menu
▾
▴
[Sblim-commit] sfcb ChangeLog, 1.731, 1.732 NEWS, 1.654, 1.655 10_interop.mof, 1.9, 1.10 interopServerProvider.c, 1.35, 1.36 default.reg.in, 1.16, 1.17
|
From: Chris B. <buc...@us...> - 2012-03-07 05:55:44
|
Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv14057
Modified Files:
ChangeLog NEWS 10_interop.mof interopServerProvider.c
default.reg.in
Log Message:
[ 3498275 ] Remove __Namespace
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -d -r1.654 -r1.655
--- NEWS 7 Mar 2012 00:52:36 -0000 1.654
+++ NEWS 7 Mar 2012 05:55:42 -0000 1.655
@@ -45,6 +45,7 @@
- 3497096 double free during stopProc
- 3497765 Better Error Handling in sfcb Provider Manager and Driver
- 3497950 SFCB Semaphore Handling Improvements
+- 3498275 Remove __Namespace
Changes in 1.3.13
=================
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.731
retrieving revision 1.732
diff -u -d -r1.731 -r1.732
--- ChangeLog 7 Mar 2012 00:52:36 -0000 1.731
+++ ChangeLog 7 Mar 2012 05:55:42 -0000 1.732
@@ -1,3 +1,8 @@
+2012-03-07 Chris Buccella <buc...@li...>
+
+ * 10_interop.mof, default.reg.in, interopServerProvider.c:
+ [ 3498275 ] Remove __Namespace
+
2012-03-06 Chris Buccella <buc...@li...>
* providerDrv.c, providerMgr.c:
Index: 10_interop.mof
===================================================================
RCS file: /cvsroot/sblim/sfcb/10_interop.mof,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- 10_interop.mof 14 May 2010 20:20:33 -0000 1.9
+++ 10_interop.mof 7 Mar 2012 05:55:42 -0000 1.10
@@ -43,12 +43,6 @@
{
};
-class __Namespace
-{
- [key]
- string Name;
-};
-
class DMY_ListenerDestinationCIMXML : CIM_ListenerDestinationCIMXML
{
};
Index: default.reg.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/default.reg.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- default.reg.in 3 Feb 2012 16:45:57 -0000 1.16
+++ default.reg.in 7 Mar 2012 05:55:42 -0000 1.17
@@ -89,12 +89,6 @@
type: instance
namespace: root/interop
#
-[__Namespace]
- provider: ServerProvider
- location: sfcInteropServerProvider
- type: instance
- namespace: *
-#
[CIM_ObjectManager]
provider: ServerProvider
location: sfcInteropServerProvider
Index: interopServerProvider.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/interopServerProvider.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- interopServerProvider.c 28 Feb 2012 22:03:36 -0000 1.35
+++ interopServerProvider.c 7 Mar 2012 05:55:42 -0000 1.36
@@ -96,15 +96,13 @@
static int genNameSpaceData(const char *ns, const char *dn, int dbl,
const CMPIResult * rslt, CMPIObjectPath *op,
- CMPIInstance *ci,int nsOpt)
+ CMPIInstance *ci)
{
if (ci) {
- if (nsOpt) CMSetProperty(ci,"Name",dn,CMPI_chars);
- else CMSetProperty(ci,"Name",ns+dbl+1,CMPI_chars);
+ CMSetProperty(ci,"Name",ns+dbl+1,CMPI_chars);
CMReturnInstance(rslt,ci);
} else if (op) {
- if (nsOpt) CMAddKey(op,"Name",dn,CMPI_chars);
- else CMAddKey(op,"Name",ns+dbl+1,CMPI_chars);
+ CMAddKey(op,"Name",ns+dbl+1,CMPI_chars);
CMReturnObjectPath(rslt,op);
}
return 0;
@@ -113,7 +111,7 @@
static void gatherNameSpacesData(const char *dn, int dbl,
const CMPIResult * rslt,
- CMPIObjectPath *op, CMPIInstance *ci, int nsOpt)
+ CMPIObjectPath *op, CMPIInstance *ci)
{
DIR *dir, *de_test;
struct dirent *de;
@@ -137,38 +135,19 @@
}
closedir(de_test);
- genNameSpaceData(n,de->d_name,dbl,rslt,op,ci,nsOpt);
- if (nsOpt!=1) {
- if (nsOpt==0) gatherNameSpacesData(n,dbl,rslt,op,ci,nsOpt);
- }
+ genNameSpaceData(n,de->d_name,dbl,rslt,op,ci);
+ gatherNameSpacesData(n,dbl,rslt,op,ci);
free(n);
}
closedir(dir);
}
}
-
-static void gatherOldNameSpacesData(const char *dn, int dbl,
- const CMPIResult * rslt,
- CMPIObjectPath *op,
- CMPIInstance *ci)
-{
-
- char *ns = (char*)CMGetNameSpace(op,NULL)->hdl;
- char *nns=alloca(strlen(dn)+strlen(ns)+8);
-
- strcpy(nns,dn);
- strcat(nns,"/");
- strcat(nns,ns);
- gatherNameSpacesData(nns,dbl,rslt,op,ci,1);
-}
-
static CMPIStatus NameSpaceProviderGetInstance(CMPIInstanceMI * mi,
const CMPIContext * ctx,
const CMPIResult * rslt,
const CMPIObjectPath * cop,
- const char **properties,
- int nsOpt)
+ const char **properties)
{
CMPIStatus st = { CMPI_RC_OK, NULL };
char *dirn,*dn,hostName[512];
@@ -177,7 +156,6 @@
CMPIInstance *ci;
CMPIString *name;
unsigned short info=0,dbl;
- char *ns;
_SFCB_ENTER(TRACE_PROVIDERS, "NameSpaceProviderGetInstance");
@@ -192,36 +170,24 @@
strcpy(dn,dirn);
if (dirn[strlen(dirn)-1]!='/') strcat(dn,"/");
strcat(dn,"repository/");
- if (nsOpt) {
- ns = CMGetCharPtr(CMGetNameSpace(cop,NULL));
- if (ns) {
- strcat(dn,ns);
- strcat(dn,"/");
- }
- }
dbl=strlen(dn);
strcat(dn,(char*)name->hdl);
if ((dir=opendir(dn))!=NULL) {
- if (nsOpt) {
- op=CMNewObjectPath(_broker,"root/interop","__Namespace",NULL);
- ci=CMNewInstance(_broker,op,NULL);
- } else {
- op=CMNewObjectPath(_broker,"root/interop","CIM_Namespace",NULL);
- ci=CMNewInstance(_broker,op,NULL);
-
- CMSetProperty(ci,"CreationClassName","CIM_Namespace",CMPI_chars);
- CMSetProperty(ci,"ObjectManagerCreationClassName","CIM_ObjectManager",CMPI_chars);
- CMSetProperty(ci,"ObjectManagerName",getSfcbUuid(),CMPI_chars);
- CMSetProperty(ci,"SystemCreationClassName","CIM_ComputerSystem",CMPI_chars);
- hostName[0]=0;
- gethostname(hostName,511);
- CMSetProperty(ci,"SystemName",hostName,CMPI_chars);
- CMSetProperty(ci,"ClassInfo",&info,CMPI_uint16);
- }
- CMSetProperty(ci,"Name",dn+dbl,CMPI_chars);
- CMReturnInstance(rslt,ci);
- closedir(dir);
+ op=CMNewObjectPath(_broker,"root/interop","CIM_Namespace",NULL);
+ ci=CMNewInstance(_broker,op,NULL);
+
+ CMSetProperty(ci,"CreationClassName","CIM_Namespace",CMPI_chars);
+ CMSetProperty(ci,"ObjectManagerCreationClassName","CIM_ObjectManager",CMPI_chars);
+ CMSetProperty(ci,"ObjectManagerName",getSfcbUuid(),CMPI_chars);
+ CMSetProperty(ci,"SystemCreationClassName","CIM_ComputerSystem",CMPI_chars);
+ hostName[0]=0;
+ gethostname(hostName,511);
+ CMSetProperty(ci,"SystemName",hostName,CMPI_chars);
+ CMSetProperty(ci,"ClassInfo",&info,CMPI_uint16);
+ CMSetProperty(ci,"Name",dn+dbl,CMPI_chars);
+ CMReturnInstance(rslt,ci);
+ closedir(dir);
}
else st.rc=CMPI_RC_ERR_NOT_FOUND;
}
@@ -234,8 +200,7 @@
const CMPIContext * ctx,
const CMPIResult * rslt,
const CMPIObjectPath * ref,
- const char **properties,
- int nsOpt)
+ const char **properties)
{
CMPIStatus st = { CMPI_RC_OK, NULL };
char *dir,*dn,hostName[512];
@@ -244,7 +209,6 @@
unsigned short info=0;
_SFCB_ENTER(TRACE_PROVIDERS, "NameSpaceProviderEnumInstances");
-
if (getControlChars("registrationDir",&dir)) {
dir = "/var/lib/sfcb/registration";
}
@@ -254,19 +218,6 @@
if (dir[strlen(dir)-1]!='/') strcat(dn,"/");
strcat(dn,"repository");
- if (nsOpt) {
- op=CMNewObjectPath(_broker,"root/interop","__Namespace",&st);
- if (op) {
- ci=CMNewInstance(_broker,op,&st);
- if (ci) {
- op=CMGetObjectPath(ci,NULL);
- CMSetNameSpaceFromObjectPath(op,ref);
- gatherOldNameSpacesData(dn,strlen(dn),rslt,op,ci);
- }
- }
- _SFCB_RETURN(st);
- }
-
op=CMNewObjectPath(_broker,"root/interop","CIM_Namespace",NULL);
ci=CMNewInstance(_broker,op,NULL);
@@ -279,7 +230,7 @@
CMSetProperty(ci,"SystemName",hostName,CMPI_chars);
CMSetProperty(ci,"ClassInfo",&info,CMPI_uint16);
- gatherNameSpacesData(dn,strlen(dn),rslt,NULL,ci,0);
+ gatherNameSpacesData(dn,strlen(dn),rslt,NULL,ci);
_SFCB_RETURN(st);
}
@@ -287,8 +238,7 @@
static CMPIStatus NameSpaceProviderEnumInstanceNames(CMPIInstanceMI * mi,
const CMPIContext * ctx,
const CMPIResult * rslt,
- const CMPIObjectPath * ref,
- int nsOpt)
+ const CMPIObjectPath * ref)
{
CMPIStatus st = { CMPI_RC_OK, NULL };
char *dir,*dn,hostName[512];
@@ -305,13 +255,6 @@
if (dir[strlen(dir)-1]!='/') strcat(dn,"/");
strcat(dn,"repository");
- if (nsOpt) {
- char *ns=(char*)CMGetNameSpace(ref,NULL)->hdl;
- op=CMNewObjectPath(_broker,ns,"__Namespace",NULL);
- gatherOldNameSpacesData(dn,strlen(dn),rslt,op,NULL);
- _SFCB_RETURN(st);
- }
-
op=CMNewObjectPath(_broker,"root/interop","CIM_Namespace",NULL);
CMAddKey(op,"CreationClassName","CIM_Namespace",CMPI_chars);
@@ -322,7 +265,7 @@
gethostname(hostName,511);
CMAddKey(op,"SystemName",hostName,CMPI_chars);
- gatherNameSpacesData(dn,strlen(dn),rslt,op,NULL,nsOpt);
+ gatherNameSpacesData(dn,strlen(dn),rslt,op,NULL);
_SFCB_RETURN(st);
}
@@ -713,9 +656,7 @@
CMPIString *cls=CMGetClassName(ref,NULL);
if (strcasecmp((char*)cls->hdl,"cim_namespace")==0)
- return NameSpaceProviderGetInstance(mi, ctx, rslt, ref, properties, 0);
- else if (strcasecmp((char*)cls->hdl,"__namespace")==0)
- return NameSpaceProviderGetInstance(mi, ctx, rslt, ref, properties, 1);
+ return NameSpaceProviderGetInstance(mi, ctx, rslt, ref, properties);
if (strcasecmp((char*)cls->hdl,"cim_objectmanager")==0)
return ServiceProviderGetInstance(mi, ctx, rslt, ref, properties,
"cim_objectmanager");
@@ -739,9 +680,7 @@
CMPIString *cls=CMGetClassName(ref,NULL);
if (strcasecmp((char*)cls->hdl,"cim_namespace")==0)
- return NameSpaceProviderEnumInstanceNames(mi, ctx, rslt, ref,0);
- if (strcasecmp((char*)cls->hdl,"__namespace")==0)
- return NameSpaceProviderEnumInstanceNames(mi, ctx, rslt, ref,1);
+ return NameSpaceProviderEnumInstanceNames(mi, ctx, rslt, ref);
if (strcasecmp((char*)cls->hdl,"cim_objectmanager")==0)
return ServiceProviderEnumInstanceNames(mi, ctx, rslt, ref,
"CIM_ObjectManager", "CIM_ComputerSystem");
@@ -765,9 +704,7 @@
CMPIString *cls=CMGetClassName(ref,NULL);
if (strcasecmp((char*)cls->hdl,"cim_namespace")==0)
- return NameSpaceProviderEnumInstances(mi, ctx, rslt, ref, properties, 0);
- if (strcasecmp((char*)cls->hdl,"__namespace")==0)
- return NameSpaceProviderEnumInstances(mi, ctx, rslt, ref, properties, 1);
+ return NameSpaceProviderEnumInstances(mi, ctx, rslt, ref, properties);
if (strcasecmp((char*)cls->hdl,"cim_objectmanager")==0)
return ObjectManagerProviderEnumInstances(mi, ctx, rslt, ref, properties);
if (strcasecmp((char*)cls->hdl,"cim_objectmanagercommunicationMechanism")==0)
|
