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.

21 files changed, 88 insertions, 125 deletions

diff --git a/src/account/LMI_AccountCapabilitiesProvider.c b/src/account/LMI_AccountCapabilitiesProvider.c
index 9526bcc..0ea129c 100644
--- a/src/account/LMI_AccountCapabilitiesProvider.c
+++ b/src/account/LMI_AccountCapabilitiesProvider.c
@@ -35,9 +35,9 @@
 
 static const CMPIBroker* _cb;
 
-static void LMI_AccountCapabilitiesInitialize()
+static void LMI_AccountCapabilitiesInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_AccountCapabilitiesCleanup( 
@@ -272,13 +272,13 @@ CMInstanceMIStub(
     LMI_AccountCapabilities,
     LMI_AccountCapabilities,
     _cb,
-    LMI_AccountCapabilitiesInitialize())
+    LMI_AccountCapabilitiesInitialize(ctx))
 
 CMAssociationMIStub( 
     LMI_AccountCapabilities,
     LMI_AccountCapabilities,
     _cb,
-    LMI_AccountCapabilitiesInitialize())
+    LMI_AccountCapabilitiesInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_AccountInstanceCreationIndicationProvider.c b/src/account/LMI_AccountInstanceCreationIndicationProvider.c
index 7bba103..06fe6e2 100644
--- a/src/account/LMI_AccountInstanceCreationIndicationProvider.c
+++ b/src/account/LMI_AccountInstanceCreationIndicationProvider.c
@@ -33,9 +33,9 @@ static const CMPIBroker* _cb = NULL;
 static IMManager *im = NULL;
 static IMError im_err = IM_ERR_OK;
 
-static void LMI_AccountInstanceCreationIndicationInitialize()
+static void LMI_AccountInstanceCreationIndicationInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
     im = im_create_manager(NULL, filter_checker, true, watcher,
                            IM_IND_CREATION, _cb, &im_err);
 }
@@ -128,7 +128,7 @@ CMIndicationMIStub(
     LMI_AccountInstanceCreationIndication,
     LMI_AccountInstanceCreationIndication,
     _cb,
-    LMI_AccountInstanceCreationIndicationInitialize())
+    LMI_AccountInstanceCreationIndicationInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_AccountInstanceDeletionIndicationProvider.c b/src/account/LMI_AccountInstanceDeletionIndicationProvider.c
index ae6e4e3..81a0e18 100644
--- a/src/account/LMI_AccountInstanceDeletionIndicationProvider.c
+++ b/src/account/LMI_AccountInstanceDeletionIndicationProvider.c
@@ -36,9 +36,9 @@ static const CMPIBroker* _cb = NULL;
 static IMManager *im = NULL;
 static IMError im_err = IM_ERR_OK;
 
-static void LMI_AccountInstanceDeletionIndicationInitialize()
+static void LMI_AccountInstanceDeletionIndicationInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
     im = im_create_manager(NULL, filter_checker, true, watcher,
                            IM_IND_DELETION, _cb, &im_err);
 }
@@ -131,7 +131,7 @@ CMIndicationMIStub(
     LMI_AccountInstanceDeletionIndication,
     LMI_AccountInstanceDeletionIndication,
     _cb,
-    LMI_AccountInstanceDeletionIndicationInitialize())
+    LMI_AccountInstanceDeletionIndicationInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_AccountManagementCapabilitiesProvider.c b/src/account/LMI_AccountManagementCapabilitiesProvider.c
index 445b5ea..7ea78ed 100644
--- a/src/account/LMI_AccountManagementCapabilitiesProvider.c
+++ b/src/account/LMI_AccountManagementCapabilitiesProvider.c
@@ -31,9 +31,9 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_AccountManagementCapabilitiesInitialize()
+static void LMI_AccountManagementCapabilitiesInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_AccountManagementCapabilitiesCleanup(
@@ -155,7 +155,7 @@ CMInstanceMIStub(
     LMI_AccountManagementCapabilities,
     LMI_AccountManagementCapabilities,
     _cb,
-    LMI_AccountManagementCapabilitiesInitialize())
+    LMI_AccountManagementCapabilitiesInitialize(ctx))
 
 static CMPIStatus LMI_AccountManagementCapabilitiesMethodCleanup(
     CMPIMethodMI* mi,
@@ -197,7 +197,7 @@ CMMethodMIStub(
     LMI_AccountManagementCapabilities,
     LMI_AccountManagementCapabilities,
     _cb,
-    LMI_AccountManagementCapabilitiesInitialize())
+    LMI_AccountManagementCapabilitiesInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c b/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c
index faa0dd8..2abe70b 100644
--- a/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c
+++ b/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c
@@ -29,9 +29,9 @@
 
 static const CMPIBroker* _cb;
 
-static void LMI_AccountManagementServiceCapabilitiesInitialize()
+static void LMI_AccountManagementServiceCapabilitiesInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_AccountManagementServiceCapabilitiesCleanup( 
@@ -241,13 +241,13 @@ CMInstanceMIStub(
     LMI_AccountManagementServiceCapabilities,
     LMI_AccountManagementServiceCapabilities,
     _cb,
-    LMI_AccountManagementServiceCapabilitiesInitialize())
+    LMI_AccountManagementServiceCapabilitiesInitialize(ctx))
 
 CMAssociationMIStub( 
     LMI_AccountManagementServiceCapabilities,
     LMI_AccountManagementServiceCapabilities,
     _cb,
-    LMI_AccountManagementServiceCapabilitiesInitialize())
+    LMI_AccountManagementServiceCapabilitiesInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_AccountManagementServiceProvider.c b/src/account/LMI_AccountManagementServiceProvider.c
index 3aac63d..df58a53 100644
--- a/src/account/LMI_AccountManagementServiceProvider.c
+++ b/src/account/LMI_AccountManagementServiceProvider.c
@@ -50,9 +50,9 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_AccountManagementServiceInitialize()
+static void LMI_AccountManagementServiceInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_AccountManagementServiceCleanup(
@@ -157,7 +157,7 @@ CMInstanceMIStub(
     LMI_AccountManagementService,
     LMI_AccountManagementService,
     _cb,
-    LMI_AccountManagementServiceInitialize())
+    LMI_AccountManagementServiceInitialize(ctx))
 
 static CMPIStatus LMI_AccountManagementServiceMethodCleanup(
     CMPIMethodMI* mi,
@@ -184,7 +184,7 @@ CMMethodMIStub(
     LMI_AccountManagementService,
     LMI_AccountManagementService,
     _cb,
-    LMI_AccountManagementServiceInitialize())
+    LMI_AccountManagementServiceInitialize(ctx))
 
 KUint32 LMI_AccountManagementService_RequestStateChange(
     const CMPIBroker* cb,
diff --git a/src/account/LMI_AccountManagementServiceSettingDataProvider.c b/src/account/LMI_AccountManagementServiceSettingDataProvider.c
index 00131a3..f75929f 100644
--- a/src/account/LMI_AccountManagementServiceSettingDataProvider.c
+++ b/src/account/LMI_AccountManagementServiceSettingDataProvider.c
@@ -25,9 +25,9 @@
 
 static const CMPIBroker* _cb;
 
-static void LMI_AccountManagementServiceSettingDataInitialize()
+static void LMI_AccountManagementServiceSettingDataInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_AccountManagementServiceSettingDataCleanup( 
@@ -210,13 +210,13 @@ CMInstanceMIStub(
     LMI_AccountManagementServiceSettingData,
     LMI_AccountManagementServiceSettingData,
     _cb,
-    LMI_AccountManagementServiceSettingDataInitialize())
+    LMI_AccountManagementServiceSettingDataInitialize(ctx))
 
 CMAssociationMIStub( 
     LMI_AccountManagementServiceSettingData,
     LMI_AccountManagementServiceSettingData,
     _cb,
-    LMI_AccountManagementServiceSettingDataInitialize())
+    LMI_AccountManagementServiceSettingDataInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_AccountOnSystemProvider.c b/src/account/LMI_AccountOnSystemProvider.c
index e78763d..9319484 100644
--- a/src/account/LMI_AccountOnSystemProvider.c
+++ b/src/account/LMI_AccountOnSystemProvider.c
@@ -35,9 +35,9 @@
 
 static const CMPIBroker* _cb;
 
-static void LMI_AccountOnSystemInitialize()
+static void LMI_AccountOnSystemInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_AccountOnSystemCleanup( 
@@ -66,12 +66,8 @@ static CMPIStatus LMI_AccountOnSystemEnumInstances(
     const char** properties) 
 {
     LMI_AccountRef laref;
-    CIM_ComputerSystemRef lcsref;
     LMI_AccountOnSystem laos;
 
-    CMPIObjectPath *computerSystemOP = NULL;
-    CMPIStatus rc;
-
     struct lu_context *luc = NULL;
     struct lu_error *error = NULL;
     GPtrArray *accounts = NULL;
@@ -81,15 +77,6 @@ static CMPIStatus LMI_AccountOnSystemEnumInstances(
     const char *nameSpace = KNameSpace(cop);
     const char *hostname = get_system_name();
 
-    CIM_ComputerSystemRef_Init(&lcsref, _cb, nameSpace);
-    CIM_ComputerSystemRef_Set_Name(&lcsref, hostname);
-    CIM_ComputerSystemRef_Set_CreationClassName(&lcsref,
-      get_system_creation_class_name());
-
-    computerSystemOP = CIM_ComputerSystemRef_ToObjectPath(&lcsref, &rc);
-    computerSystemOP->ft->setClassName(computerSystemOP,
-      get_system_creation_class_name());
-
     luc = lu_start(NULL, lu_user, NULL, NULL, lu_prompt_console_quiet, NULL, &error);
     if (!luc)
       {
@@ -110,8 +97,9 @@ static CMPIStatus LMI_AccountOnSystemEnumInstances(
         LMI_AccountRef_Set_Name(&laref, aux_lu_get_str(lue, LU_USERNAME));
 
         LMI_AccountOnSystem_Init(&laos, _cb, nameSpace);
+        KPrintObjectPath(stderr, lmi_get_computer_system(), 1);
         LMI_AccountOnSystem_SetObjectPath_GroupComponent(&laos,
-          computerSystemOP);
+          lmi_get_computer_system());
         LMI_AccountOnSystem_Set_PartComponent(&laos, &laref);
 
         KReturnInstance(cr, laos);
@@ -279,13 +267,13 @@ CMInstanceMIStub(
     LMI_AccountOnSystem,
     LMI_AccountOnSystem,
     _cb,
-    LMI_AccountOnSystemInitialize())
+    LMI_AccountOnSystemInitialize(ctx))
 
 CMAssociationMIStub( 
     LMI_AccountOnSystem,
     LMI_AccountOnSystem,
     _cb,
-    LMI_AccountOnSystemInitialize())
+    LMI_AccountOnSystemInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_AccountProvider.c b/src/account/LMI_AccountProvider.c
index d8e279a..cde4792 100644
--- a/src/account/LMI_AccountProvider.c
+++ b/src/account/LMI_AccountProvider.c
@@ -58,9 +58,9 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_AccountInitialize()
+static void LMI_AccountInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
     if (init_lock_pool() == 0) {
         error("Unable to initialize lock pool.");
         exit (1);
@@ -647,7 +647,7 @@ CMInstanceMIStub(
     LMI_Account,
     LMI_Account,
     _cb,
-    LMI_AccountInitialize())
+    LMI_AccountInitialize(ctx))
 
 static CMPIStatus LMI_AccountMethodCleanup(
     CMPIMethodMI* mi,
@@ -675,7 +675,7 @@ CMMethodMIStub(
     LMI_Account,
     LMI_Account,
     _cb,
-    LMI_AccountInitialize())
+    LMI_AccountInitialize(ctx))
 
 KUint32 LMI_Account_RequestStateChange(
     const CMPIBroker* cb,
diff --git a/src/account/LMI_AccountSettingDataProvider.c b/src/account/LMI_AccountSettingDataProvider.c
index 4061db8..be76c80 100644
--- a/src/account/LMI_AccountSettingDataProvider.c
+++ b/src/account/LMI_AccountSettingDataProvider.c
@@ -30,9 +30,9 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_AccountSettingDataInitialize()
+static void LMI_AccountSettingDataInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_AccountSettingDataCleanup(
@@ -119,7 +119,7 @@ CMInstanceMIStub(
     LMI_AccountSettingData,
     LMI_AccountSettingData,
     _cb,
-    LMI_AccountSettingDataInitialize())
+    LMI_AccountSettingDataInitialize(ctx))
 
 static CMPIStatus LMI_AccountSettingDataMethodCleanup(
     CMPIMethodMI* mi,
@@ -146,7 +146,7 @@ CMMethodMIStub(
     LMI_AccountSettingData,
     LMI_AccountSettingData,
     _cb,
-    LMI_AccountSettingDataInitialize())
+    LMI_AccountSettingDataInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_AssignedAccountIdentityProvider.c b/src/account/LMI_AssignedAccountIdentityProvider.c
index 9a9c272..8ef308d 100644
--- a/src/account/LMI_AssignedAccountIdentityProvider.c
+++ b/src/account/LMI_AssignedAccountIdentityProvider.c
@@ -33,9 +33,9 @@
 
 static const CMPIBroker* _cb;
 
-static void LMI_AssignedAccountIdentityInitialize()
+static void LMI_AssignedAccountIdentityInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_AssignedAccountIdentityCleanup( 
@@ -269,13 +269,13 @@ CMInstanceMIStub(
     LMI_AssignedAccountIdentity,
     LMI_AssignedAccountIdentity,
     _cb,
-    LMI_AssignedAccountIdentityInitialize())
+    LMI_AssignedAccountIdentityInitialize(ctx))
 
 CMAssociationMIStub( 
     LMI_AssignedAccountIdentity,
     LMI_AssignedAccountIdentity,
     _cb,
-    LMI_AssignedAccountIdentityInitialize())
+    LMI_AssignedAccountIdentityInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_AssignedGroupIdentityProvider.c b/src/account/LMI_AssignedGroupIdentityProvider.c
index d406b3c..5b673db 100644
--- a/src/account/LMI_AssignedGroupIdentityProvider.c
+++ b/src/account/LMI_AssignedGroupIdentityProvider.c
@@ -33,9 +33,9 @@
 
 static const CMPIBroker* _cb;
 
-static void LMI_AssignedGroupIdentityInitialize()
+static void LMI_AssignedGroupIdentityInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_AssignedGroupIdentityCleanup( 
@@ -258,13 +258,13 @@ CMInstanceMIStub(
     LMI_AssignedGroupIdentity,
     LMI_AssignedGroupIdentity,
     _cb,
-    LMI_AssignedGroupIdentityInitialize())
+    LMI_AssignedGroupIdentityInitialize(ctx))
 
 CMAssociationMIStub( 
     LMI_AssignedGroupIdentity,
     LMI_AssignedGroupIdentity,
     _cb,
-    LMI_AssignedGroupIdentityInitialize())
+    LMI_AssignedGroupIdentityInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_EnabledAccountCapabilitiesProvider.c b/src/account/LMI_EnabledAccountCapabilitiesProvider.c
index e014024..27f2f07 100644
--- a/src/account/LMI_EnabledAccountCapabilitiesProvider.c
+++ b/src/account/LMI_EnabledAccountCapabilitiesProvider.c
@@ -29,9 +29,9 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_EnabledAccountCapabilitiesInitialize()
+static void LMI_EnabledAccountCapabilitiesInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_EnabledAccountCapabilitiesCleanup(
@@ -131,7 +131,7 @@ CMInstanceMIStub(
     LMI_EnabledAccountCapabilities,
     LMI_EnabledAccountCapabilities,
     _cb,
-    LMI_EnabledAccountCapabilitiesInitialize())
+    LMI_EnabledAccountCapabilitiesInitialize(ctx))
 
 static CMPIStatus LMI_EnabledAccountCapabilitiesMethodCleanup(
     CMPIMethodMI* mi,
@@ -158,7 +158,7 @@ CMMethodMIStub(
     LMI_EnabledAccountCapabilities,
     LMI_EnabledAccountCapabilities,
     _cb,
-    LMI_EnabledAccountCapabilitiesInitialize())
+    LMI_EnabledAccountCapabilitiesInitialize(ctx))
 
 KUint16 LMI_EnabledAccountCapabilities_CreateGoalSettings(
     const CMPIBroker* cb,
diff --git a/src/account/LMI_GroupProvider.c b/src/account/LMI_GroupProvider.c
index ff1955c..c19646d 100644
--- a/src/account/LMI_GroupProvider.c
+++ b/src/account/LMI_GroupProvider.c
@@ -39,9 +39,9 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_GroupInitialize()
+static void LMI_GroupInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_GroupCleanup(
@@ -250,7 +250,7 @@ CMInstanceMIStub(
     LMI_Group,
     LMI_Group,
     _cb,
-    LMI_GroupInitialize())
+    LMI_GroupInitialize(ctx))
 
 static CMPIStatus LMI_GroupMethodCleanup(
     CMPIMethodMI* mi,
@@ -304,7 +304,7 @@ CMMethodMIStub(
     LMI_Group,
     LMI_Group,
     _cb,
-    LMI_GroupInitialize())
+    LMI_GroupInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_HostedAccountManagementServiceProvider.c b/src/account/LMI_HostedAccountManagementServiceProvider.c
index b605f87..69c89e7 100644
--- a/src/account/LMI_HostedAccountManagementServiceProvider.c
+++ b/src/account/LMI_HostedAccountManagementServiceProvider.c
@@ -29,9 +29,9 @@
 
 static const CMPIBroker* _cb;
 
-static void LMI_HostedAccountManagementServiceInitialize()
+static void LMI_HostedAccountManagementServiceInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_HostedAccountManagementServiceCleanup(
@@ -59,25 +59,12 @@ static CMPIStatus LMI_HostedAccountManagementServiceEnumInstances(
     const CMPIObjectPath* cop, 
     const char** properties) 
 {
-    CIM_ComputerSystemRef lcsref;
     LMI_AccountManagementServiceRef lamsref;
     LMI_HostedAccountManagementService lhs;
 
-    CMPIObjectPath *computerSystemOP = NULL;
-    CMPIStatus rc;
-
     const char *nameSpace = KNameSpace(cop);
     const char *hostname = get_system_name();
 
-    CIM_ComputerSystemRef_Init(&lcsref, _cb, nameSpace);
-    CIM_ComputerSystemRef_Set_Name(&lcsref, hostname);
-    CIM_ComputerSystemRef_Set_CreationClassName(&lcsref,
-      get_system_creation_class_name());
-
-    computerSystemOP = CIM_ComputerSystemRef_ToObjectPath(&lcsref, &rc);
-    computerSystemOP->ft->setClassName(computerSystemOP,
-      get_system_creation_class_name());
-
     LMI_AccountManagementServiceRef_Init(&lamsref, _cb, nameSpace);
     LMI_AccountManagementServiceRef_Set_Name(&lamsref, LAMSNAME);
     LMI_AccountManagementServiceRef_Set_SystemCreationClassName(&lamsref,
@@ -87,7 +74,8 @@ static CMPIStatus LMI_HostedAccountManagementServiceEnumInstances(
       LMI_AccountManagementService_ClassName);
 
     LMI_HostedAccountManagementService_Init(&lhs, _cb, nameSpace);
-    LMI_HostedAccountManagementService_SetObjectPath_Antecedent(&lhs, computerSystemOP);
+    LMI_HostedAccountManagementService_SetObjectPath_Antecedent(&lhs,
+            lmi_get_computer_system());
     LMI_HostedAccountManagementService_Set_Dependent(&lhs, &lamsref);
 
     KReturnInstance(cr, lhs);
@@ -246,13 +234,13 @@ CMInstanceMIStub(
     LMI_HostedAccountManagementService,
     LMI_HostedAccountManagementService,
     _cb,
-    LMI_HostedAccountManagementServiceInitialize())
+    LMI_HostedAccountManagementServiceInitialize(ctx))
 
 CMAssociationMIStub( 
     LMI_HostedAccountManagementService,
     LMI_HostedAccountManagementService,
     _cb,
-    LMI_HostedAccountManagementServiceInitialize())
+    LMI_HostedAccountManagementServiceInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_IdentityProvider.c b/src/account/LMI_IdentityProvider.c
index a86a5f7..df3ffe7 100644
--- a/src/account/LMI_IdentityProvider.c
+++ b/src/account/LMI_IdentityProvider.c
@@ -31,9 +31,9 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_IdentityInitialize()
+static void LMI_IdentityInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_IdentityCleanup(
@@ -251,7 +251,7 @@ CMInstanceMIStub(
     LMI_Identity,
     LMI_Identity,
     _cb,
-    LMI_IdentityInitialize())
+    LMI_IdentityInitialize(ctx))
 
 static CMPIStatus LMI_IdentityMethodCleanup(
     CMPIMethodMI* mi,
@@ -278,7 +278,7 @@ CMMethodMIStub(
     LMI_Identity,
     LMI_Identity,
     _cb,
-    LMI_IdentityInitialize())
+    LMI_IdentityInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_MemberOfGroupProvider.c b/src/account/LMI_MemberOfGroupProvider.c
index 4e2212e..1751e41 100644
--- a/src/account/LMI_MemberOfGroupProvider.c
+++ b/src/account/LMI_MemberOfGroupProvider.c
@@ -34,9 +34,9 @@
 
 static const CMPIBroker* _cb;
 
-static void LMI_MemberOfGroupInitialize()
+static void LMI_MemberOfGroupInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_MemberOfGroupCleanup( 
@@ -448,13 +448,13 @@ CMInstanceMIStub(
     LMI_MemberOfGroup,
     LMI_MemberOfGroup,
     _cb,
-    LMI_MemberOfGroupInitialize())
+    LMI_MemberOfGroupInitialize(ctx))
 
 CMAssociationMIStub( 
     LMI_MemberOfGroup,
     LMI_MemberOfGroup,
     _cb,
-    LMI_MemberOfGroupInitialize())
+    LMI_MemberOfGroupInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_OwningGroupProvider.c b/src/account/LMI_OwningGroupProvider.c
index a7506f8..12ea99a 100644
--- a/src/account/LMI_OwningGroupProvider.c
+++ b/src/account/LMI_OwningGroupProvider.c
@@ -33,9 +33,9 @@
 
 static const CMPIBroker* _cb;
 
-static void LMI_OwningGroupInitialize()
+static void LMI_OwningGroupInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_OwningGroupCleanup( 
@@ -63,13 +63,9 @@ static CMPIStatus LMI_OwningGroupEnumInstances(
     const CMPIObjectPath* cop, 
     const char** properties) 
 {
-    CIM_ComputerSystemRef lcsref;
     LMI_GroupRef lgref;
     LMI_OwningGroup log;
 
-    CMPIObjectPath *computerSystemOP = NULL;
-    CMPIStatus rc;
-
     struct lu_context *luc = NULL;
     struct lu_error *error = NULL;
     GPtrArray *groups = NULL;
@@ -77,16 +73,6 @@ static CMPIStatus LMI_OwningGroupEnumInstances(
 
     size_t i;
     const char *nameSpace = KNameSpace(cop);
-    const char *hostname = get_system_name();
-
-    CIM_ComputerSystemRef_Init(&lcsref, _cb, nameSpace);
-    CIM_ComputerSystemRef_Set_Name(&lcsref, hostname);
-    CIM_ComputerSystemRef_Set_CreationClassName(&lcsref,
-      get_system_creation_class_name());
-
-    computerSystemOP = CIM_ComputerSystemRef_ToObjectPath(&lcsref, &rc);
-    computerSystemOP->ft->setClassName(computerSystemOP,
-      get_system_creation_class_name());
 
     luc = lu_start(NULL, lu_group, NULL, NULL, lu_prompt_console_quiet, NULL, &error);
     if (!luc)
@@ -104,7 +90,8 @@ static CMPIStatus LMI_OwningGroupEnumInstances(
         LMI_GroupRef_Set_CreationClassName(&lgref, LMI_Group_ClassName);
 
         LMI_OwningGroup_Init(&log, _cb, nameSpace);
-        LMI_OwningGroup_SetObjectPath_OwningElement(&log, computerSystemOP);
+        LMI_OwningGroup_SetObjectPath_OwningElement(&log,
+                lmi_get_computer_system());
         LMI_OwningGroup_Set_OwnedElement(&log, &lgref);
 
         KReturnInstance(cr, log);
@@ -273,13 +260,13 @@ CMInstanceMIStub(
     LMI_OwningGroup,
     LMI_OwningGroup,
     _cb,
-    LMI_OwningGroupInitialize())
+    LMI_OwningGroupInitialize(ctx))
 
 CMAssociationMIStub( 
     LMI_OwningGroup,
     LMI_OwningGroup,
     _cb,
-    LMI_OwningGroupInitialize())
+    LMI_OwningGroupInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_ServiceAffectsIdentityProvider.c b/src/account/LMI_ServiceAffectsIdentityProvider.c
index 8b46ebd..5b257ac 100644
--- a/src/account/LMI_ServiceAffectsIdentityProvider.c
+++ b/src/account/LMI_ServiceAffectsIdentityProvider.c
@@ -33,9 +33,9 @@
 
 static const CMPIBroker* _cb;
 
-static void LMI_ServiceAffectsIdentityInitialize()
+static void LMI_ServiceAffectsIdentityInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_ServiceAffectsIdentityCleanup( 
@@ -305,13 +305,13 @@ CMInstanceMIStub(
     LMI_ServiceAffectsIdentity,
     LMI_ServiceAffectsIdentity,
     _cb,
-    LMI_ServiceAffectsIdentityInitialize())
+    LMI_ServiceAffectsIdentityInitialize(ctx))
 
 CMAssociationMIStub( 
     LMI_ServiceAffectsIdentity,
     LMI_ServiceAffectsIdentity,
     _cb,
-    LMI_ServiceAffectsIdentityInitialize())
+    LMI_ServiceAffectsIdentityInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_SettingsDefineAccountCapabilitiesProvider.c b/src/account/LMI_SettingsDefineAccountCapabilitiesProvider.c
index c8f545a..203640c 100644
--- a/src/account/LMI_SettingsDefineAccountCapabilitiesProvider.c
+++ b/src/account/LMI_SettingsDefineAccountCapabilitiesProvider.c
@@ -25,9 +25,9 @@
 
 static const CMPIBroker* _cb;
 
-static void LMI_SettingsDefineAccountCapabilitiesInitialize()
+static void LMI_SettingsDefineAccountCapabilitiesInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_SettingsDefineAccountCapabilitiesCleanup( 
@@ -210,13 +210,13 @@ CMInstanceMIStub(
     LMI_SettingsDefineAccountCapabilities,
     LMI_SettingsDefineAccountCapabilities,
     _cb,
-    LMI_SettingsDefineAccountCapabilitiesInitialize())
+    LMI_SettingsDefineAccountCapabilitiesInitialize(ctx))
 
 CMAssociationMIStub( 
     LMI_SettingsDefineAccountCapabilities,
     LMI_SettingsDefineAccountCapabilities,
     _cb,
-    LMI_SettingsDefineAccountCapabilitiesInitialize())
+    LMI_SettingsDefineAccountCapabilitiesInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/account/LMI_SettingsDefineManagementCapabilitiesProvider.c b/src/account/LMI_SettingsDefineManagementCapabilitiesProvider.c
index fdfd1f0..82f8b25 100644
--- a/src/account/LMI_SettingsDefineManagementCapabilitiesProvider.c
+++ b/src/account/LMI_SettingsDefineManagementCapabilitiesProvider.c
@@ -25,9 +25,9 @@
 
 static const CMPIBroker* _cb;
 
-static void LMI_SettingsDefineManagementCapabilitiesInitialize()
+static void LMI_SettingsDefineManagementCapabilitiesInitialize(const CMPIContext *ctx)
 {
-    lmi_init(provider_name, _cb, provider_config_defaults);
+    lmi_init(provider_name, _cb, ctx, provider_config_defaults);
 }
 
 static CMPIStatus LMI_SettingsDefineManagementCapabilitiesCleanup( 
@@ -210,13 +210,13 @@ CMInstanceMIStub(
     LMI_SettingsDefineManagementCapabilities,
     LMI_SettingsDefineManagementCapabilities,
     _cb,
-    LMI_SettingsDefineManagementCapabilitiesInitialize())
+    LMI_SettingsDefineManagementCapabilitiesInitialize(ctx))
 
 CMAssociationMIStub( 
     LMI_SettingsDefineManagementCapabilities,
     LMI_SettingsDefineManagementCapabilities,
     _cb,
-    LMI_SettingsDefineManagementCapabilitiesInitialize())
+    LMI_SettingsDefineManagementCapabilitiesInitialize(ctx))
 
 KONKRET_REGISTRATION(
     "root/cimv2",