Add lmi_get_computer_system function and fix lmi_get_system_name

PG_ComputerSystem has different method how to get hostname than our
providers. In order to create the associations to this class we need to
enumerate it. The downside is that all providers must supply CMPIContext
to the lmi_init function.

New function lmi_get_computer_system returns CMPIObjectPath to the
configured CIM_ComputerSystem subclass instance. This object should be
used in all references with ComputerSystem.

Function lmi_get_system_name has been altered to return same value as
ComputerSystem "Name" property.

12 files changed, 61 insertions, 79 deletions

diff --git a/src/logicalfile/LMI_DataFileProvider.c b/src/logicalfile/LMI_DataFileProvider.c
index fb34b47..096991b 100644
--- a/src/logicalfile/LMI_DataFileProvider.c
+++ b/src/logicalfile/LMI_DataFileProvider.c
@@ -23,9 +23,9 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_DataFileInitialize()
+static void LMI_DataFileInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_DataFileCleanup(
@@ -65,7 +65,7 @@ static CMPIStatus LMI_DataFileGetInstance(
     CMPIStatus st = {.rc = CMPI_RC_OK};
     logicalfile_t logicalfile;
 
-    st = lmi_check_required(_cb, cop);
+    st = lmi_check_required(_cb, cc, cop);
     check_status(st);
 
     LMI_DataFile_InitFromObjectPath(&logicalfile.lf.datafile, _cb, cop);
@@ -121,7 +121,7 @@ CMInstanceMIStub(
     LMI_DataFile,
     LMI_DataFile,
     _cb,
-    LMI_DataFileInitialize())
+    LMI_DataFileInitialize(ctx))
 
 static CMPIStatus LMI_DataFileMethodCleanup(
     CMPIMethodMI* mi,
@@ -148,7 +148,7 @@ CMMethodMIStub(
     LMI_DataFile,
     LMI_DataFile,
     _cb,
-    LMI_DataFileInitialize())
+    LMI_DataFileInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/logicalfile/LMI_DirectoryContainsFileProvider.c b/src/logicalfile/LMI_DirectoryContainsFileProvider.c
index 6eb74c6..4cf37dc 100644
--- a/src/logicalfile/LMI_DirectoryContainsFileProvider.c
+++ b/src/logicalfile/LMI_DirectoryContainsFileProvider.c
@@ -140,7 +140,7 @@ static CMPIStatus associators(
     int group = -1;
     int rgroup = -1;
 
-    st = lmi_check_required(_cb, cop);
+    st = lmi_check_required(_cb, cc, cop);
     if (st.rc != CMPI_RC_OK) {
         return st;
     }
@@ -265,7 +265,7 @@ static CMPIStatus references(
             group = 0;
         }
     }
-    st = lmi_check_required(_cb, cop);
+    st = lmi_check_required(_cb, cc, cop);
     check_status(st);
 
     CIM_DirectoryRef_Init(&lmi_dr, _cb, ns);
@@ -343,9 +343,9 @@ static CMPIStatus references(
     CMReturn(CMPI_RC_OK);
 }
 
-static void LMI_DirectoryContainsFileInitialize()
+static void LMI_DirectoryContainsFileInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_DirectoryContainsFileCleanup(
@@ -492,13 +492,13 @@ CMInstanceMIStub(
     LMI_DirectoryContainsFile,
     LMI_DirectoryContainsFile,
     _cb,
-    LMI_DirectoryContainsFileInitialize())
+    LMI_DirectoryContainsFileInitialize(ctx))
 
 CMAssociationMIStub(
     LMI_DirectoryContainsFile,
     LMI_DirectoryContainsFile,
     _cb,
-    LMI_DirectoryContainsFileInitialize())
+    LMI_DirectoryContainsFileInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/logicalfile/LMI_FIFOPipeFileProvider.c b/src/logicalfile/LMI_FIFOPipeFileProvider.c
index 8277e49..c1f40a7 100644
--- a/src/logicalfile/LMI_FIFOPipeFileProvider.c
+++ b/src/logicalfile/LMI_FIFOPipeFileProvider.c
@@ -23,9 +23,9 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_FIFOPipeFileInitialize()
+static void LMI_FIFOPipeFileInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_FIFOPipeFileCleanup(
@@ -65,7 +65,7 @@ static CMPIStatus LMI_FIFOPipeFileGetInstance(
     CMPIStatus st = {.rc = CMPI_RC_OK};
     logicalfile_t logicalfile;
 
-    st = lmi_check_required(_cb, cop);
+    st = lmi_check_required(_cb, cc, cop);
     check_status(st);
 
     LMI_FIFOPipeFile_InitFromObjectPath(&logicalfile.lf.fifopipefile, _cb, cop);
@@ -123,7 +123,7 @@ CMInstanceMIStub(
     LMI_FIFOPipeFile,
     LMI_FIFOPipeFile,
     _cb,
-    LMI_FIFOPipeFileInitialize())
+    LMI_FIFOPipeFileInitialize(ctx))
 
 static CMPIStatus LMI_FIFOPipeFileMethodCleanup(
     CMPIMethodMI* mi,
@@ -150,7 +150,7 @@ CMMethodMIStub(
     LMI_FIFOPipeFile,
     LMI_FIFOPipeFile,
     _cb,
-    LMI_FIFOPipeFileInitialize())
+    LMI_FIFOPipeFileInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/logicalfile/LMI_FileIdentityProvider.c b/src/logicalfile/LMI_FileIdentityProvider.c
index cf47d17..c143fdb 100644
--- a/src/logicalfile/LMI_FileIdentityProvider.c
+++ b/src/logicalfile/LMI_FileIdentityProvider.c
@@ -52,7 +52,7 @@ static CMPIStatus associators(
 
     if (CMClassPathIsA(_cb, cop, LMI_UnixFile_ClassName, &st)) {
         /* got UnixFile - SameElement */
-        st = lmi_check_required(_cb, cop);
+        st = lmi_check_required(_cb, cc, cop);
         check_status(st);
 
         path = get_string_property_from_op(cop, "LFName");
@@ -76,7 +76,7 @@ static CMPIStatus associators(
         CMSetClassName(o, fileclass);
     } else {
         /* got LogicalFile - SystemElement */
-        st = lmi_check_required(_cb, cop);
+        st = lmi_check_required(_cb, cc, cop);
         check_status(st);
 
         path = get_string_property_from_op(cop, "Name");
@@ -143,7 +143,7 @@ static CMPIStatus references(
         /* got UnixFile - SameElement */
         LMI_FileIdentity_SetObjectPath_SameElement(&lmi_fi, cop);
 
-        st = lmi_check_required(_cb, cop);
+        st = lmi_check_required(_cb, cc, cop);
         if (st.rc != CMPI_RC_OK) {
             return st;
         }
@@ -169,7 +169,7 @@ static CMPIStatus references(
         /* got LogicalFile - SystemElement */
         LMI_FileIdentity_SetObjectPath_SystemElement(&lmi_fi, cop);
 
-        st = lmi_check_required(_cb, cop);
+        st = lmi_check_required(_cb, cc, cop);
         if (st.rc != CMPI_RC_OK) {
             return st;
         }
@@ -206,9 +206,9 @@ static CMPIStatus references(
     return res;
 }
 
-static void LMI_FileIdentityInitialize()
+static void LMI_FileIdentityInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_FileIdentityCleanup(
@@ -354,13 +354,13 @@ CMInstanceMIStub(
     LMI_FileIdentity,
     LMI_FileIdentity,
     _cb,
-    LMI_FileIdentityInitialize())
+    LMI_FileIdentityInitialize(ctx))
 
 CMAssociationMIStub(
     LMI_FileIdentity,
     LMI_FileIdentity,
     _cb,
-    LMI_FileIdentityInitialize())
+    LMI_FileIdentityInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/logicalfile/LMI_RootDirectoryProvider.c b/src/logicalfile/LMI_RootDirectoryProvider.c
index 7de3689..fc175bc 100644
--- a/src/logicalfile/LMI_RootDirectoryProvider.c
+++ b/src/logicalfile/LMI_RootDirectoryProvider.c
@@ -65,16 +65,10 @@ static CMPIStatus associators(
             CMReturn(CMPI_RC_OK);
         }
 
-        CIM_ComputerSystemRef cim_csr;
-        CIM_ComputerSystemRef_Init(&cim_csr, _cb, ns);
-        CIM_ComputerSystemRef_Set_Name(&cim_csr, get_system_name());
-        CIM_ComputerSystemRef_Set_CreationClassName(&cim_csr, comp_ccname);
-        o = CIM_ComputerSystemRef_ToObjectPath(&cim_csr, &st);
-        CMSetClassName(o, comp_ccname);
         if (names) {
-            CMReturnObjectPath(cr, o);
+            CMReturnObjectPath(cr, lmi_get_computer_system());
         } else {
-            ci = _cb->bft->getInstance(_cb, cc, o, properties, &st);
+            ci = _cb->bft->getInstance(_cb, cc, lmi_get_computer_system(), properties, &st);
             CMReturnInstance(cr, ci);
         }
     } else {
@@ -117,7 +111,6 @@ static CMPIStatus references(
     CMPIObjectPath *o;
     CMPIInstance *ci;
     CMPIStatus st;
-    const char *comp_ccname = get_system_creation_class_name();
     const char *ns = KNameSpace(cop);
     const char *path = get_string_property_from_op(cop, "Name");
     char ccname[BUFLEN];
@@ -141,17 +134,12 @@ static CMPIStatus references(
         if (strcmp(path, "/") != 0) {
             CMReturn(CMPI_RC_OK);
         }
-        st = lmi_check_required(_cb, cop);
+        st = lmi_check_required(_cb, cc, cop);
         check_status(st);
         LMI_RootDirectory_SetObjectPath_PartComponent(&lmi_rd, cop);
 
-        CIM_ComputerSystemRef cim_csr;
-        CIM_ComputerSystemRef_Init(&cim_csr, _cb, ns);
-        CIM_ComputerSystemRef_Set_Name(&cim_csr, get_system_name());
-        CIM_ComputerSystemRef_Set_CreationClassName(&cim_csr, comp_ccname);
-        o = CIM_ComputerSystemRef_ToObjectPath(&cim_csr, &st);
-        CMSetClassName(o, comp_ccname);
-        LMI_RootDirectory_SetObjectPath_GroupComponent(&lmi_rd, o);
+        LMI_RootDirectory_SetObjectPath_GroupComponent(&lmi_rd,
+                lmi_get_computer_system());
     } else {
         /* got CIM_ComputerSystem - GroupComponent */
         if (role && strcmp(role, GROUP_COMPONENT) != 0) {
@@ -177,9 +165,9 @@ static CMPIStatus references(
     CMReturn(CMPI_RC_OK);
 }
 
-static void LMI_RootDirectoryInitialize()
+static void LMI_RootDirectoryInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_RootDirectoryCleanup(
@@ -210,18 +198,11 @@ static CMPIStatus LMI_RootDirectoryEnumInstances(
     CMPIStatus st;
     char *fsname;
     const char *ns = KNameSpace(cop);
-    const char *ccname = lmi_get_system_creation_class_name();
 
     LMI_RootDirectory lmi_rd;
     LMI_RootDirectory_Init(&lmi_rd, _cb, ns);
 
-    CIM_ComputerSystemRef cim_csr;
-    CIM_ComputerSystemRef_Init(&cim_csr, _cb, ns);
-    CIM_ComputerSystemRef_Set_Name(&cim_csr, lmi_get_system_name());
-    CIM_ComputerSystemRef_Set_CreationClassName(&cim_csr, ccname);
-    o = CIM_ComputerSystemRef_ToObjectPath(&cim_csr, NULL);
-    CMSetClassName(o, ccname);
-    LMI_RootDirectory_SetObjectPath_GroupComponent(&lmi_rd, o);
+    LMI_RootDirectory_SetObjectPath_GroupComponent(&lmi_rd, lmi_get_computer_system());
 
     LMI_UnixDirectory lmi_ud;
     LMI_UnixDirectory_Init(&lmi_ud, _cb, ns);
@@ -351,13 +332,13 @@ CMInstanceMIStub(
     LMI_RootDirectory,
     LMI_RootDirectory,
     _cb,
-    LMI_RootDirectoryInitialize())
+    LMI_RootDirectoryInitialize(ctx))
 
 CMAssociationMIStub(
     LMI_RootDirectory,
     LMI_RootDirectory,
     _cb,
-    LMI_RootDirectoryInitialize())
+    LMI_RootDirectoryInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/logicalfile/LMI_SymbolicLinkProvider.c b/src/logicalfile/LMI_SymbolicLinkProvider.c
index ea88a8b..5226c6b 100644
--- a/src/logicalfile/LMI_SymbolicLinkProvider.c
+++ b/src/logicalfile/LMI_SymbolicLinkProvider.c
@@ -23,9 +23,9 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_SymbolicLinkInitialize()
+static void LMI_SymbolicLinkInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_SymbolicLinkCleanup(
@@ -65,7 +65,7 @@ static CMPIStatus LMI_SymbolicLinkGetInstance(
     CMPIStatus st = {.rc = CMPI_RC_OK};
     logicalfile_t logicalfile;
 
-    st = lmi_check_required(_cb, cop);
+    st = lmi_check_required(_cb, cc, cop);
     check_status(st);
 
     LMI_SymbolicLink_InitFromObjectPath(&logicalfile.lf.symboliclink, _cb, cop);
@@ -121,7 +121,7 @@ CMInstanceMIStub(
     LMI_SymbolicLink,
     LMI_SymbolicLink,
     _cb,
-    LMI_SymbolicLinkInitialize())
+    LMI_SymbolicLinkInitialize(ctx))
 
 static CMPIStatus LMI_SymbolicLinkMethodCleanup(
     CMPIMethodMI* mi,
@@ -148,7 +148,7 @@ CMMethodMIStub(
     LMI_SymbolicLink,
     LMI_SymbolicLink,
     _cb,
-    LMI_SymbolicLinkInitialize())
+    LMI_SymbolicLinkInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/logicalfile/LMI_UnixDeviceFileProvider.c b/src/logicalfile/LMI_UnixDeviceFileProvider.c
index 2d48d35..4a924bf 100644
--- a/src/logicalfile/LMI_UnixDeviceFileProvider.c
+++ b/src/logicalfile/LMI_UnixDeviceFileProvider.c
@@ -23,9 +23,9 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_UnixDeviceFileInitialize()
+static void LMI_UnixDeviceFileInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_UnixDeviceFileCleanup(
@@ -65,7 +65,7 @@ static CMPIStatus LMI_UnixDeviceFileGetInstance(
     CMPIStatus st = {.rc = CMPI_RC_OK};
     logicalfile_t logicalfile;
 
-    st = lmi_check_required(_cb, cop);
+    st = lmi_check_required(_cb, cc, cop);
     check_status(st);
 
     LMI_UnixDeviceFile_InitFromObjectPath(&logicalfile.lf.unixdevicefile, _cb, cop);
@@ -121,7 +121,7 @@ CMInstanceMIStub(
     LMI_UnixDeviceFile,
     LMI_UnixDeviceFile,
     _cb,
-    LMI_UnixDeviceFileInitialize())
+    LMI_UnixDeviceFileInitialize(ctx))
 
 static CMPIStatus LMI_UnixDeviceFileMethodCleanup(
     CMPIMethodMI* mi,
@@ -148,7 +148,7 @@ CMMethodMIStub(
     LMI_UnixDeviceFile,
     LMI_UnixDeviceFile,
     _cb,
-    LMI_UnixDeviceFileInitialize())
+    LMI_UnixDeviceFileInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/logicalfile/LMI_UnixDirectoryProvider.c b/src/logicalfile/LMI_UnixDirectoryProvider.c
index 04de5cc..af4be57 100644
--- a/src/logicalfile/LMI_UnixDirectoryProvider.c
+++ b/src/logicalfile/LMI_UnixDirectoryProvider.c
@@ -25,9 +25,9 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_UnixDirectoryInitialize()
+static void LMI_UnixDirectoryInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_UnixDirectoryCleanup(
@@ -67,7 +67,7 @@ static CMPIStatus LMI_UnixDirectoryGetInstance(
     CMPIStatus st = {.rc = CMPI_RC_OK};
     logicalfile_t logicalfile;
 
-    st = lmi_check_required(_cb, cop);
+    st = lmi_check_required(_cb, cc, cop);
     check_status(st);
 
     LMI_UnixDirectory_InitFromObjectPath(&logicalfile.lf.unixdirectory, _cb, cop);
@@ -143,7 +143,7 @@ CMInstanceMIStub(
     LMI_UnixDirectory,
     LMI_UnixDirectory,
     _cb,
-    LMI_UnixDirectoryInitialize())
+    LMI_UnixDirectoryInitialize(ctx))
 
 static CMPIStatus LMI_UnixDirectoryMethodCleanup(
     CMPIMethodMI* mi,
@@ -170,7 +170,7 @@ CMMethodMIStub(
     LMI_UnixDirectory,
     LMI_UnixDirectory,
     _cb,
-    LMI_UnixDirectoryInitialize())
+    LMI_UnixDirectoryInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/logicalfile/LMI_UnixFileProvider.c b/src/logicalfile/LMI_UnixFileProvider.c
index b9be867..fbe467c 100644
--- a/src/logicalfile/LMI_UnixFileProvider.c
+++ b/src/logicalfile/LMI_UnixFileProvider.c
@@ -66,9 +66,9 @@ static struct selabel_handle *get_selabel_handle()
 }
 #endif
 
-static void LMI_UnixFileInitialize()
+static void LMI_UnixFileInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 #ifdef LOGICALFILE_SELINUX
     pthread_mutex_init(&selinux_mutex, NULL);
 #endif
@@ -121,7 +121,7 @@ static CMPIStatus LMI_UnixFileGetInstance(
     const char *path;
     char *fsname;
 
-    st = lmi_check_required(_cb, cop);
+    st = lmi_check_required(_cb, cc, cop);
     if (st.rc != CMPI_RC_OK) {
         return st;
     }
@@ -226,7 +226,7 @@ CMInstanceMIStub(
     LMI_UnixFile,
     LMI_UnixFile,
     _cb,
-    LMI_UnixFileInitialize())
+    LMI_UnixFileInitialize(ctx))
 
 static CMPIStatus LMI_UnixFileMethodCleanup(
     CMPIMethodMI* mi,
@@ -253,7 +253,7 @@ CMMethodMIStub(
     LMI_UnixFile,
     LMI_UnixFile,
     _cb,
-    LMI_UnixFileInitialize())
+    LMI_UnixFileInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/logicalfile/LMI_UnixSocketProvider.c b/src/logicalfile/LMI_UnixSocketProvider.c
index 2da6aad..644c4dd 100644
--- a/src/logicalfile/LMI_UnixSocketProvider.c
+++ b/src/logicalfile/LMI_UnixSocketProvider.c
@@ -23,9 +23,9 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_UnixSocketInitialize()
+static void LMI_UnixSocketInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_UnixSocketCleanup(
@@ -65,7 +65,7 @@ static CMPIStatus LMI_UnixSocketGetInstance(
     CMPIStatus st = {.rc = CMPI_RC_OK};
     logicalfile_t logicalfile;
 
-    st = lmi_check_required(_cb, cop);
+    st = lmi_check_required(_cb, cc, cop);
     check_status(st);
 
     LMI_UnixSocket_InitFromObjectPath(&logicalfile.lf.unixsocket, _cb, cop);
@@ -121,7 +121,7 @@ CMInstanceMIStub(
     LMI_UnixSocket,
     LMI_UnixSocket,
     _cb,
-    LMI_UnixSocketInitialize())
+    LMI_UnixSocketInitialize(ctx))
 
 static CMPIStatus LMI_UnixSocketMethodCleanup(
     CMPIMethodMI* mi,
@@ -148,7 +148,7 @@ CMMethodMIStub(
     LMI_UnixSocket,
     LMI_UnixSocket,
     _cb,
-    LMI_UnixSocketInitialize())
+    LMI_UnixSocketInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/logicalfile/file.c b/src/logicalfile/file.c
index d2505c2..7796189 100644
--- a/src/logicalfile/file.c
+++ b/src/logicalfile/file.c
@@ -25,6 +25,7 @@ const char *provider_name = "logicalfile";
 
 CMPIStatus lmi_check_required(
     const CMPIBroker *b,
+    const CMPIContext *ctx,
     const CMPIObjectPath *o)
 {
     const char *prop;
diff --git a/src/logicalfile/file.h b/src/logicalfile/file.h
index 58646f1..09c428a 100644
--- a/src/logicalfile/file.h
+++ b/src/logicalfile/file.h
@@ -122,7 +122,7 @@ typedef struct {
 	} lf;
 } logicalfile_t;
 
-CMPIStatus lmi_check_required(const CMPIBroker *, const CMPIObjectPath *);
+CMPIStatus lmi_check_required(const CMPIBroker *, const CMPIContext *, const CMPIObjectPath *);
 void get_class_from_stat(const struct stat *, char *);
 int get_class_from_path(const char *, char *);
 CMPIStatus get_fsname_from_stat(const CMPIBroker *, const struct stat *, char **);