diff options
90 files changed, 157 insertions, 2 deletions
diff --git a/src/account/LMI_AccountCapabilitiesProvider.c b/src/account/LMI_AccountCapabilitiesProvider.c index c950b3a..9526bcc 100644 --- a/src/account/LMI_AccountCapabilitiesProvider.c +++ b/src/account/LMI_AccountCapabilitiesProvider.c @@ -26,6 +26,7 @@ #include "macros.h" #include "globals.h" #include "aux_lu.h" +#include "account_globals.h" #include <libuser/entity.h> #include <libuser/user.h> @@ -36,6 +37,7 @@ static const CMPIBroker* _cb; static void LMI_AccountCapabilitiesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_AccountCapabilitiesCleanup( diff --git a/src/account/LMI_AccountInstanceCreationIndicationProvider.c b/src/account/LMI_AccountInstanceCreationIndicationProvider.c index a3e149a..7bba103 100644 --- a/src/account/LMI_AccountInstanceCreationIndicationProvider.c +++ b/src/account/LMI_AccountInstanceCreationIndicationProvider.c @@ -25,6 +25,8 @@ #include "indication_common.h" #include "macros.h" +#include "account_globals.h" +#include "openlmi.h" static const CMPIBroker* _cb = NULL; @@ -33,6 +35,7 @@ static IMError im_err = IM_ERR_OK; static void LMI_AccountInstanceCreationIndicationInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); im = im_create_manager(NULL, filter_checker, true, watcher, IM_IND_CREATION, _cb, &im_err); } diff --git a/src/account/LMI_AccountInstanceDeletionIndicationProvider.c b/src/account/LMI_AccountInstanceDeletionIndicationProvider.c index 0e17cc1..ae6e4e3 100644 --- a/src/account/LMI_AccountInstanceDeletionIndicationProvider.c +++ b/src/account/LMI_AccountInstanceDeletionIndicationProvider.c @@ -28,6 +28,8 @@ #include "indication_common.h" #include "macros.h" +#include "account_globals.h" +#include "openlmi.h" static const CMPIBroker* _cb = NULL; @@ -36,6 +38,7 @@ static IMError im_err = IM_ERR_OK; static void LMI_AccountInstanceDeletionIndicationInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); im = im_create_manager(NULL, filter_checker, true, watcher, IM_IND_DELETION, _cb, &im_err); } diff --git a/src/account/LMI_AccountManagementCapabilitiesProvider.c b/src/account/LMI_AccountManagementCapabilitiesProvider.c index 85eef0f..445b5ea 100644 --- a/src/account/LMI_AccountManagementCapabilitiesProvider.c +++ b/src/account/LMI_AccountManagementCapabilitiesProvider.c @@ -33,6 +33,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_AccountManagementCapabilitiesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_AccountManagementCapabilitiesCleanup( diff --git a/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c b/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c index febc4f3..faa0dd8 100644 --- a/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c +++ b/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c @@ -24,12 +24,14 @@ #include "LMI_AccountManagementCapabilities.h" #include "macros.h" +#include "account_globals.h" #include "globals.h" static const CMPIBroker* _cb; static void LMI_AccountManagementServiceCapabilitiesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_AccountManagementServiceCapabilitiesCleanup( diff --git a/src/account/LMI_AccountManagementServiceProvider.c b/src/account/LMI_AccountManagementServiceProvider.c index 37cd775..1a166d7 100644 --- a/src/account/LMI_AccountManagementServiceProvider.c +++ b/src/account/LMI_AccountManagementServiceProvider.c @@ -30,6 +30,7 @@ #include "globals.h" #include "aux_lu.h" +#include "account_globals.h" #include <libuser/entity.h> #include <libuser/user.h> @@ -51,6 +52,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_AccountManagementServiceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_AccountManagementServiceCleanup( diff --git a/src/account/LMI_AccountManagementServiceSettingDataProvider.c b/src/account/LMI_AccountManagementServiceSettingDataProvider.c index 89ae650..00131a3 100644 --- a/src/account/LMI_AccountManagementServiceSettingDataProvider.c +++ b/src/account/LMI_AccountManagementServiceSettingDataProvider.c @@ -21,10 +21,13 @@ #include <konkret/konkret.h> #include "LMI_AccountManagementServiceSettingData.h" +#include "account_globals.h" + static const CMPIBroker* _cb; static void LMI_AccountManagementServiceSettingDataInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_AccountManagementServiceSettingDataCleanup( diff --git a/src/account/LMI_AccountOnSystemProvider.c b/src/account/LMI_AccountOnSystemProvider.c index dd03bae..e78763d 100644 --- a/src/account/LMI_AccountOnSystemProvider.c +++ b/src/account/LMI_AccountOnSystemProvider.c @@ -30,12 +30,14 @@ #include "aux_lu.h" #include "macros.h" +#include "account_globals.h" #include "globals.h" static const CMPIBroker* _cb; static void LMI_AccountOnSystemInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_AccountOnSystemCleanup( diff --git a/src/account/LMI_AccountProvider.c b/src/account/LMI_AccountProvider.c index 7601f41..52bc1cf 100644 --- a/src/account/LMI_AccountProvider.c +++ b/src/account/LMI_AccountProvider.c @@ -44,6 +44,7 @@ #include "macros.h" #include "globals.h" #include "lock.h" +#include "account_globals.h" // Return values of functions // Delete user @@ -56,6 +57,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_AccountInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); if (init_lock_pool() == 0) { error("Unable to initialize lock pool."); exit (1); diff --git a/src/account/LMI_AccountSettingDataProvider.c b/src/account/LMI_AccountSettingDataProvider.c index 4c51cee..4061db8 100644 --- a/src/account/LMI_AccountSettingDataProvider.c +++ b/src/account/LMI_AccountSettingDataProvider.c @@ -22,6 +22,7 @@ #include "LMI_AccountSettingData.h" #include "macros.h" +#include "account_globals.h" #include "globals.h" #include <libuser/config.h> @@ -31,6 +32,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_AccountSettingDataInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_AccountSettingDataCleanup( diff --git a/src/account/LMI_AssignedAccountIdentityProvider.c b/src/account/LMI_AssignedAccountIdentityProvider.c index e4cd879..9a9c272 100644 --- a/src/account/LMI_AssignedAccountIdentityProvider.c +++ b/src/account/LMI_AssignedAccountIdentityProvider.c @@ -25,6 +25,7 @@ #include "aux_lu.h" #include "macros.h" +#include "account_globals.h" #include "globals.h" #include <libuser/entity.h> @@ -34,6 +35,7 @@ static const CMPIBroker* _cb; static void LMI_AssignedAccountIdentityInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_AssignedAccountIdentityCleanup( diff --git a/src/account/LMI_AssignedGroupIdentityProvider.c b/src/account/LMI_AssignedGroupIdentityProvider.c index d25d276..d406b3c 100644 --- a/src/account/LMI_AssignedGroupIdentityProvider.c +++ b/src/account/LMI_AssignedGroupIdentityProvider.c @@ -25,6 +25,7 @@ #include "aux_lu.h" #include "macros.h" +#include "account_globals.h" #include "globals.h" #include <libuser/entity.h> @@ -34,6 +35,7 @@ static const CMPIBroker* _cb; static void LMI_AssignedGroupIdentityInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_AssignedGroupIdentityCleanup( diff --git a/src/account/LMI_EnabledAccountCapabilitiesProvider.c b/src/account/LMI_EnabledAccountCapabilitiesProvider.c index 014247a..e014024 100644 --- a/src/account/LMI_EnabledAccountCapabilitiesProvider.c +++ b/src/account/LMI_EnabledAccountCapabilitiesProvider.c @@ -22,6 +22,7 @@ #include "LMI_EnabledAccountCapabilities.h" #include "macros.h" +#include "account_globals.h" #include "globals.h" #include <stdbool.h> @@ -30,6 +31,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_EnabledAccountCapabilitiesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_EnabledAccountCapabilitiesCleanup( diff --git a/src/account/LMI_GroupProvider.c b/src/account/LMI_GroupProvider.c index 0dd548d..6e64c21 100644 --- a/src/account/LMI_GroupProvider.c +++ b/src/account/LMI_GroupProvider.c @@ -26,12 +26,14 @@ #include "aux_lu.h" #include "macros.h" +#include "account_globals.h" #include "globals.h" static const CMPIBroker* _cb = NULL; static void LMI_GroupInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_GroupCleanup( diff --git a/src/account/LMI_HostedAccountManagementServiceProvider.c b/src/account/LMI_HostedAccountManagementServiceProvider.c index dd03a5f..b605f87 100644 --- a/src/account/LMI_HostedAccountManagementServiceProvider.c +++ b/src/account/LMI_HostedAccountManagementServiceProvider.c @@ -24,12 +24,14 @@ #include "LMI_AccountManagementService.h" #include "macros.h" +#include "account_globals.h" #include "globals.h" static const CMPIBroker* _cb; static void LMI_HostedAccountManagementServiceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_HostedAccountManagementServiceCleanup( diff --git a/src/account/LMI_IdentityProvider.c b/src/account/LMI_IdentityProvider.c index fe6ebb2..a86a5f7 100644 --- a/src/account/LMI_IdentityProvider.c +++ b/src/account/LMI_IdentityProvider.c @@ -27,11 +27,13 @@ #include "macros.h" #include "globals.h" #include "aux_lu.h" +#include "account_globals.h" static const CMPIBroker* _cb = NULL; static void LMI_IdentityInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_IdentityCleanup( diff --git a/src/account/LMI_MemberOfGroupProvider.c b/src/account/LMI_MemberOfGroupProvider.c index 0ea9160..4e27def 100644 --- a/src/account/LMI_MemberOfGroupProvider.c +++ b/src/account/LMI_MemberOfGroupProvider.c @@ -26,6 +26,7 @@ #include "aux_lu.h" #include "macros.h" +#include "account_globals.h" #include "globals.h" #include <libuser/entity.h> @@ -35,6 +36,7 @@ static const CMPIBroker* _cb; static void LMI_MemberOfGroupInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_MemberOfGroupCleanup( diff --git a/src/account/LMI_OwningGroupProvider.c b/src/account/LMI_OwningGroupProvider.c index 23f4a42..a7506f8 100644 --- a/src/account/LMI_OwningGroupProvider.c +++ b/src/account/LMI_OwningGroupProvider.c @@ -26,6 +26,7 @@ #include "macros.h" #include "globals.h" #include "aux_lu.h" +#include "account_globals.h" #include <libuser/user.h> #include <libuser/entity.h> @@ -34,6 +35,7 @@ static const CMPIBroker* _cb; static void LMI_OwningGroupInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_OwningGroupCleanup( diff --git a/src/account/LMI_ServiceAffectsIdentityProvider.c b/src/account/LMI_ServiceAffectsIdentityProvider.c index 5e39a37..8b46ebd 100644 --- a/src/account/LMI_ServiceAffectsIdentityProvider.c +++ b/src/account/LMI_ServiceAffectsIdentityProvider.c @@ -26,6 +26,7 @@ #include "macros.h" #include "globals.h" #include "aux_lu.h" +#include "account_globals.h" #include <libuser/entity.h> #include <libuser/user.h> @@ -34,6 +35,7 @@ static const CMPIBroker* _cb; static void LMI_ServiceAffectsIdentityInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ServiceAffectsIdentityCleanup( diff --git a/src/account/LMI_SettingsDefineAccountCapabilitiesProvider.c b/src/account/LMI_SettingsDefineAccountCapabilitiesProvider.c index 05e952f..c8f545a 100644 --- a/src/account/LMI_SettingsDefineAccountCapabilitiesProvider.c +++ b/src/account/LMI_SettingsDefineAccountCapabilitiesProvider.c @@ -21,10 +21,13 @@ #include <konkret/konkret.h> #include "LMI_SettingsDefineAccountCapabilities.h" +#include "account_globals.h" + static const CMPIBroker* _cb; static void LMI_SettingsDefineAccountCapabilitiesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_SettingsDefineAccountCapabilitiesCleanup( diff --git a/src/account/LMI_SettingsDefineManagementCapabilitiesProvider.c b/src/account/LMI_SettingsDefineManagementCapabilitiesProvider.c index c0db7a5..fdfd1f0 100644 --- a/src/account/LMI_SettingsDefineManagementCapabilitiesProvider.c +++ b/src/account/LMI_SettingsDefineManagementCapabilitiesProvider.c @@ -21,10 +21,13 @@ #include <konkret/konkret.h> #include "LMI_SettingsDefineManagementCapabilities.h" +#include "account_globals.h" + static const CMPIBroker* _cb; static void LMI_SettingsDefineManagementCapabilitiesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_SettingsDefineManagementCapabilitiesCleanup( diff --git a/src/account/account_globals.c b/src/account/account_globals.c index e5e90e0..20146d3 100644 --- a/src/account/account_globals.c +++ b/src/account/account_globals.c @@ -21,4 +21,7 @@ #include "account_globals.h" #include <stddef.h> +const char *provider_name = "account"; +const ConfigEntry *provider_config_defaults = NULL; + const char *crypt_algs[] = {CRYPT_ALGS, NULL}; diff --git a/src/account/account_globals.h b/src/account/account_globals.h index 4226b33..8659e6b 100644 --- a/src/account/account_globals.h +++ b/src/account/account_globals.h @@ -21,6 +21,11 @@ #ifndef ACCOUNT_GLOBALS_H #define ACCOUNT_GLOBALS_H +#include "openlmi.h" + +const char *provider_name; +const ConfigEntry *provider_config_defaults; + /* Global declaration of valid cryptographic algorithms */ extern const char * crypt_algs[]; #endif diff --git a/src/fan/LMI_FanAssociatedSensorProvider.c b/src/fan/LMI_FanAssociatedSensorProvider.c index 4253e96..a70adcb 100644 --- a/src/fan/LMI_FanAssociatedSensorProvider.c +++ b/src/fan/LMI_FanAssociatedSensorProvider.c @@ -27,6 +27,7 @@ static const CMPIBroker* _cb; static void LMI_FanAssociatedSensorInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); init_linux_fan_module(); } diff --git a/src/fan/LMI_FanProvider.c b/src/fan/LMI_FanProvider.c index de65deb..2a82551 100644 --- a/src/fan/LMI_FanProvider.c +++ b/src/fan/LMI_FanProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_FanInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); init_linux_fan_module(); } diff --git a/src/fan/LMI_FanSensorProvider.c b/src/fan/LMI_FanSensorProvider.c index 9b9d750..ff459d2 100644 --- a/src/fan/LMI_FanSensorProvider.c +++ b/src/fan/LMI_FanSensorProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_FanSensorInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); init_linux_fan_module(); } diff --git a/src/fan/fan.c b/src/fan/fan.c index 3038503..370572e 100644 --- a/src/fan/fan.c +++ b/src/fan/fan.c @@ -30,6 +30,9 @@ #include "fan.h" #include "globals.h" +const char *provider_name = "fan"; +const ConfigEntry *provider_config_defaults = NULL; + #define MAX_CHIP_NAME_LENGTH 200 //* constants ***************************************************************** diff --git a/src/fan/fan.h b/src/fan/fan.h index 02c6c5c..c0c595b 100644 --- a/src/fan/fan.h +++ b/src/fan/fan.h @@ -22,6 +22,7 @@ #define LINUX_FAN_H_ #include <stdbool.h> +#include "openlmi.h" /** accessible features of fan * each value represents a bit position in accessible_features vector in @@ -38,6 +39,9 @@ #define CIM_FAN_AF_ALARM_MAX (1 << 8) #define CIM_FAN_AF_FEATURE_MAX (1 << 8) +const char *provider_name; +const ConfigEntry *provider_config_defaults; + /** * Descriptions of attributes are taken from: * sysfs-interface documentation of hwmon diff --git a/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c b/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c index 6310ea9..57a25c2 100644 --- a/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c +++ b/src/hardware/LMI_AssociatedProcessorCacheMemoryProvider.c @@ -37,6 +37,7 @@ static const CMPIBroker* _cb; static void LMI_AssociatedProcessorCacheMemoryInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_AssociatedProcessorCacheMemoryCleanup( diff --git a/src/hardware/LMI_BaseboardContainerProvider.c b/src/hardware/LMI_BaseboardContainerProvider.c index 22dee90..eac6f26 100644 --- a/src/hardware/LMI_BaseboardContainerProvider.c +++ b/src/hardware/LMI_BaseboardContainerProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_BaseboardContainerInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_BaseboardContainerCleanup( diff --git a/src/hardware/LMI_BaseboardProvider.c b/src/hardware/LMI_BaseboardProvider.c index f3a7690..627fc8a 100644 --- a/src/hardware/LMI_BaseboardProvider.c +++ b/src/hardware/LMI_BaseboardProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_BaseboardInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_BaseboardCleanup( diff --git a/src/hardware/LMI_BatteryPhysicalPackageProvider.c b/src/hardware/LMI_BatteryPhysicalPackageProvider.c index fbd4888..738e56d 100644 --- a/src/hardware/LMI_BatteryPhysicalPackageProvider.c +++ b/src/hardware/LMI_BatteryPhysicalPackageProvider.c @@ -29,6 +29,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_BatteryPhysicalPackageInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_BatteryPhysicalPackageCleanup( diff --git a/src/hardware/LMI_BatteryProvider.c b/src/hardware/LMI_BatteryProvider.c index f5b8e77..91a1004 100644 --- a/src/hardware/LMI_BatteryProvider.c +++ b/src/hardware/LMI_BatteryProvider.c @@ -30,6 +30,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_BatteryInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_BatteryCleanup( diff --git a/src/hardware/LMI_BatterySystemDeviceProvider.c b/src/hardware/LMI_BatterySystemDeviceProvider.c index 58d59dc..c71de0c 100644 --- a/src/hardware/LMI_BatterySystemDeviceProvider.c +++ b/src/hardware/LMI_BatterySystemDeviceProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_BatterySystemDeviceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_BatterySystemDeviceCleanup( diff --git a/src/hardware/LMI_ChassisComputerSystemPackageProvider.c b/src/hardware/LMI_ChassisComputerSystemPackageProvider.c index 2f8e082..db188e1 100644 --- a/src/hardware/LMI_ChassisComputerSystemPackageProvider.c +++ b/src/hardware/LMI_ChassisComputerSystemPackageProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_ChassisComputerSystemPackageInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ChassisComputerSystemPackageCleanup( diff --git a/src/hardware/LMI_ChassisProvider.c b/src/hardware/LMI_ChassisProvider.c index 3214d58..5ab2a39 100644 --- a/src/hardware/LMI_ChassisProvider.c +++ b/src/hardware/LMI_ChassisProvider.c @@ -30,6 +30,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_ChassisInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ChassisCleanup( diff --git a/src/hardware/LMI_Hardware.h b/src/hardware/LMI_Hardware.h index 7f94055..0ea6237 100644 --- a/src/hardware/LMI_Hardware.h +++ b/src/hardware/LMI_Hardware.h @@ -21,6 +21,11 @@ #ifndef LMI_HARDWARE_H_ #define LMI_HARDWARE_H_ +#include "globals.h" + +const ConfigEntry *provider_config_defaults; +const char *provider_name; + #define INSTANCE_ID_LEN 128 #define ELEMENT_NAME_LEN 128 diff --git a/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c b/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c index 49f543b..50ea529 100644 --- a/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c +++ b/src/hardware/LMI_MemoryPhysicalPackageInConnectorProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_MemoryPhysicalPackageInConnectorInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_MemoryPhysicalPackageInConnectorCleanup( diff --git a/src/hardware/LMI_MemoryPhysicalPackageProvider.c b/src/hardware/LMI_MemoryPhysicalPackageProvider.c index 0e819eb..f86557d 100644 --- a/src/hardware/LMI_MemoryPhysicalPackageProvider.c +++ b/src/hardware/LMI_MemoryPhysicalPackageProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_MemoryPhysicalPackageInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_MemoryPhysicalPackageCleanup( diff --git a/src/hardware/LMI_MemoryProvider.c b/src/hardware/LMI_MemoryProvider.c index 4f2ab7f..f5f9ae8 100644 --- a/src/hardware/LMI_MemoryProvider.c +++ b/src/hardware/LMI_MemoryProvider.c @@ -33,6 +33,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_MemoryInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_MemoryCleanup( diff --git a/src/hardware/LMI_MemorySlotContainerProvider.c b/src/hardware/LMI_MemorySlotContainerProvider.c index 37c7bce..6cc83b4 100644 --- a/src/hardware/LMI_MemorySlotContainerProvider.c +++ b/src/hardware/LMI_MemorySlotContainerProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_MemorySlotContainerInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_MemorySlotContainerCleanup( diff --git a/src/hardware/LMI_MemorySlotProvider.c b/src/hardware/LMI_MemorySlotProvider.c index d76be9a..9c72d15 100644 --- a/src/hardware/LMI_MemorySlotProvider.c +++ b/src/hardware/LMI_MemorySlotProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_MemorySlotInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_MemorySlotCleanup( diff --git a/src/hardware/LMI_MemorySystemDeviceProvider.c b/src/hardware/LMI_MemorySystemDeviceProvider.c index d4d310a..9b25535 100644 --- a/src/hardware/LMI_MemorySystemDeviceProvider.c +++ b/src/hardware/LMI_MemorySystemDeviceProvider.c @@ -27,6 +27,7 @@ static const CMPIBroker* _cb; static void LMI_MemorySystemDeviceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_MemorySystemDeviceCleanup( diff --git a/src/hardware/LMI_PCIBridgeProvider.c b/src/hardware/LMI_PCIBridgeProvider.c index 3392772..27f7ac2 100644 --- a/src/hardware/LMI_PCIBridgeProvider.c +++ b/src/hardware/LMI_PCIBridgeProvider.c @@ -30,6 +30,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_PCIBridgeInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PCIBridgeCleanup( diff --git a/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c b/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c index 2151dd5..de83816 100644 --- a/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c +++ b/src/hardware/LMI_PCIBridgeSystemDeviceProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_PCIBridgeSystemDeviceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PCIBridgeSystemDeviceCleanup( diff --git a/src/hardware/LMI_PCIDeviceProvider.c b/src/hardware/LMI_PCIDeviceProvider.c index cc6adc8..f304f40 100644 --- a/src/hardware/LMI_PCIDeviceProvider.c +++ b/src/hardware/LMI_PCIDeviceProvider.c @@ -29,6 +29,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_PCIDeviceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PCIDeviceCleanup( diff --git a/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c b/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c index 897f7bc..be7c9f3 100644 --- a/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c +++ b/src/hardware/LMI_PCIDeviceSystemDeviceProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_PCIDeviceSystemDeviceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PCIDeviceSystemDeviceCleanup( diff --git a/src/hardware/LMI_PhysicalBatteryContainerProvider.c b/src/hardware/LMI_PhysicalBatteryContainerProvider.c index 890cd93..67acbb7 100644 --- a/src/hardware/LMI_PhysicalBatteryContainerProvider.c +++ b/src/hardware/LMI_PhysicalBatteryContainerProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_PhysicalBatteryContainerInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PhysicalBatteryContainerCleanup( diff --git a/src/hardware/LMI_PhysicalBatteryRealizesProvider.c b/src/hardware/LMI_PhysicalBatteryRealizesProvider.c index c554fd5..66ab5f7 100644 --- a/src/hardware/LMI_PhysicalBatteryRealizesProvider.c +++ b/src/hardware/LMI_PhysicalBatteryRealizesProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_PhysicalBatteryRealizesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PhysicalBatteryRealizesCleanup( diff --git a/src/hardware/LMI_PhysicalMemoryContainerProvider.c b/src/hardware/LMI_PhysicalMemoryContainerProvider.c index 427bef8..57cd994 100644 --- a/src/hardware/LMI_PhysicalMemoryContainerProvider.c +++ b/src/hardware/LMI_PhysicalMemoryContainerProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_PhysicalMemoryContainerInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PhysicalMemoryContainerCleanup( diff --git a/src/hardware/LMI_PhysicalMemoryProvider.c b/src/hardware/LMI_PhysicalMemoryProvider.c index 51be88f..53d5256 100644 --- a/src/hardware/LMI_PhysicalMemoryProvider.c +++ b/src/hardware/LMI_PhysicalMemoryProvider.c @@ -31,6 +31,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_PhysicalMemoryInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PhysicalMemoryCleanup( diff --git a/src/hardware/LMI_PhysicalMemoryRealizesProvider.c b/src/hardware/LMI_PhysicalMemoryRealizesProvider.c index 0da8d33..c50e517 100644 --- a/src/hardware/LMI_PhysicalMemoryRealizesProvider.c +++ b/src/hardware/LMI_PhysicalMemoryRealizesProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_PhysicalMemoryRealizesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PhysicalMemoryRealizesCleanup( diff --git a/src/hardware/LMI_PointingDeviceProvider.c b/src/hardware/LMI_PointingDeviceProvider.c index d5203d2..5fbecb8 100644 --- a/src/hardware/LMI_PointingDeviceProvider.c +++ b/src/hardware/LMI_PointingDeviceProvider.c @@ -30,6 +30,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_PointingDeviceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PointingDeviceCleanup( diff --git a/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c b/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c index d54f678..5b53af3 100644 --- a/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c +++ b/src/hardware/LMI_PortPhysicalConnectorContainerProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_PortPhysicalConnectorContainerInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PortPhysicalConnectorContainerCleanup( diff --git a/src/hardware/LMI_PortPhysicalConnectorProvider.c b/src/hardware/LMI_PortPhysicalConnectorProvider.c index 4027928..75f6738 100644 --- a/src/hardware/LMI_PortPhysicalConnectorProvider.c +++ b/src/hardware/LMI_PortPhysicalConnectorProvider.c @@ -30,6 +30,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_PortPhysicalConnectorInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_PortPhysicalConnectorCleanup( diff --git a/src/hardware/LMI_ProcessorCacheMemoryProvider.c b/src/hardware/LMI_ProcessorCacheMemoryProvider.c index 2791b95..65c3867 100644 --- a/src/hardware/LMI_ProcessorCacheMemoryProvider.c +++ b/src/hardware/LMI_ProcessorCacheMemoryProvider.c @@ -31,6 +31,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_ProcessorCacheMemoryInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorCacheMemoryCleanup( diff --git a/src/hardware/LMI_ProcessorCapabilitiesProvider.c b/src/hardware/LMI_ProcessorCapabilitiesProvider.c index d398523..b3bf7b6 100644 --- a/src/hardware/LMI_ProcessorCapabilitiesProvider.c +++ b/src/hardware/LMI_ProcessorCapabilitiesProvider.c @@ -29,6 +29,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_ProcessorCapabilitiesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorCapabilitiesCleanup( diff --git a/src/hardware/LMI_ProcessorChipContainerProvider.c b/src/hardware/LMI_ProcessorChipContainerProvider.c index b300121..9662380 100644 --- a/src/hardware/LMI_ProcessorChipContainerProvider.c +++ b/src/hardware/LMI_ProcessorChipContainerProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_ProcessorChipContainerInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorChipContainerCleanup( diff --git a/src/hardware/LMI_ProcessorChipProvider.c b/src/hardware/LMI_ProcessorChipProvider.c index 1606dce..9949de6 100644 --- a/src/hardware/LMI_ProcessorChipProvider.c +++ b/src/hardware/LMI_ProcessorChipProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_ProcessorChipInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorChipCleanup( diff --git a/src/hardware/LMI_ProcessorChipRealizesProvider.c b/src/hardware/LMI_ProcessorChipRealizesProvider.c index 55efba8..6d85c7d 100644 --- a/src/hardware/LMI_ProcessorChipRealizesProvider.c +++ b/src/hardware/LMI_ProcessorChipRealizesProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_ProcessorChipRealizesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorChipRealizesCleanup( diff --git a/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c b/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c index b9b042d..2f25e62 100644 --- a/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c +++ b/src/hardware/LMI_ProcessorElementCapabilitiesProvider.c @@ -31,6 +31,7 @@ static const CMPIBroker* _cb; static void LMI_ProcessorElementCapabilitiesInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorElementCapabilitiesCleanup( diff --git a/src/hardware/LMI_ProcessorProvider.c b/src/hardware/LMI_ProcessorProvider.c index 8e1c9f5..fbf1d13 100644 --- a/src/hardware/LMI_ProcessorProvider.c +++ b/src/hardware/LMI_ProcessorProvider.c @@ -40,6 +40,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_ProcessorInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorCleanup( diff --git a/src/hardware/LMI_ProcessorSystemDeviceProvider.c b/src/hardware/LMI_ProcessorSystemDeviceProvider.c index 327f711..2b5112a 100644 --- a/src/hardware/LMI_ProcessorSystemDeviceProvider.c +++ b/src/hardware/LMI_ProcessorSystemDeviceProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_ProcessorSystemDeviceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ProcessorSystemDeviceCleanup( diff --git a/src/hardware/LMI_SystemSlotContainerProvider.c b/src/hardware/LMI_SystemSlotContainerProvider.c index 7a25254..af39495 100644 --- a/src/hardware/LMI_SystemSlotContainerProvider.c +++ b/src/hardware/LMI_SystemSlotContainerProvider.c @@ -28,6 +28,7 @@ static const CMPIBroker* _cb; static void LMI_SystemSlotContainerInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_SystemSlotContainerCleanup( diff --git a/src/hardware/LMI_SystemSlotProvider.c b/src/hardware/LMI_SystemSlotProvider.c index 3feba71..0de8344 100644 --- a/src/hardware/LMI_SystemSlotProvider.c +++ b/src/hardware/LMI_SystemSlotProvider.c @@ -31,6 +31,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_SystemSlotInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_SystemSlotCleanup( diff --git a/src/hardware/utils.c b/src/hardware/utils.c index c9deda9..20d9fca 100644 --- a/src/hardware/utils.c +++ b/src/hardware/utils.c @@ -20,6 +20,8 @@ #include "utils.h" +const ConfigEntry *provider_config_defaults = NULL; +const char *provider_name = "hardware"; short read_fp_to_2d_buffer(FILE *fp, char ***buffer, unsigned *buffer_size) { diff --git a/src/logicalfile/LMI_DataFileProvider.c b/src/logicalfile/LMI_DataFileProvider.c index 4053fcd..fb34b47 100644 --- a/src/logicalfile/LMI_DataFileProvider.c +++ b/src/logicalfile/LMI_DataFileProvider.c @@ -25,6 +25,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_DataFileInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_DataFileCleanup( diff --git a/src/logicalfile/LMI_DirectoryContainsFileProvider.c b/src/logicalfile/LMI_DirectoryContainsFileProvider.c index 06bc7b9..18eba8b 100644 --- a/src/logicalfile/LMI_DirectoryContainsFileProvider.c +++ b/src/logicalfile/LMI_DirectoryContainsFileProvider.c @@ -371,6 +371,7 @@ static CMPIStatus references( static void LMI_DirectoryContainsFileInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_DirectoryContainsFileCleanup( diff --git a/src/logicalfile/LMI_FIFOPipeFileProvider.c b/src/logicalfile/LMI_FIFOPipeFileProvider.c index 6179f16..8277e49 100644 --- a/src/logicalfile/LMI_FIFOPipeFileProvider.c +++ b/src/logicalfile/LMI_FIFOPipeFileProvider.c @@ -25,6 +25,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_FIFOPipeFileInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_FIFOPipeFileCleanup( diff --git a/src/logicalfile/LMI_FileIdentityProvider.c b/src/logicalfile/LMI_FileIdentityProvider.c index adb841b..f041c5b 100644 --- a/src/logicalfile/LMI_FileIdentityProvider.c +++ b/src/logicalfile/LMI_FileIdentityProvider.c @@ -255,6 +255,7 @@ static CMPIStatus references( static void LMI_FileIdentityInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_FileIdentityCleanup( diff --git a/src/logicalfile/LMI_RootDirectoryProvider.c b/src/logicalfile/LMI_RootDirectoryProvider.c index 4bb1a31..9b4ecac 100644 --- a/src/logicalfile/LMI_RootDirectoryProvider.c +++ b/src/logicalfile/LMI_RootDirectoryProvider.c @@ -209,6 +209,7 @@ static CMPIStatus references( static void LMI_RootDirectoryInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_RootDirectoryCleanup( diff --git a/src/logicalfile/LMI_SymbolicLinkProvider.c b/src/logicalfile/LMI_SymbolicLinkProvider.c index cff8851..ea88a8b 100644 --- a/src/logicalfile/LMI_SymbolicLinkProvider.c +++ b/src/logicalfile/LMI_SymbolicLinkProvider.c @@ -25,6 +25,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_SymbolicLinkInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_SymbolicLinkCleanup( diff --git a/src/logicalfile/LMI_UnixDeviceFileProvider.c b/src/logicalfile/LMI_UnixDeviceFileProvider.c index 6a707f8..2d48d35 100644 --- a/src/logicalfile/LMI_UnixDeviceFileProvider.c +++ b/src/logicalfile/LMI_UnixDeviceFileProvider.c @@ -25,6 +25,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_UnixDeviceFileInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_UnixDeviceFileCleanup( diff --git a/src/logicalfile/LMI_UnixDirectoryProvider.c b/src/logicalfile/LMI_UnixDirectoryProvider.c index df51fb5..04de5cc 100644 --- a/src/logicalfile/LMI_UnixDirectoryProvider.c +++ b/src/logicalfile/LMI_UnixDirectoryProvider.c @@ -27,6 +27,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_UnixDirectoryInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_UnixDirectoryCleanup( diff --git a/src/logicalfile/LMI_UnixFileProvider.c b/src/logicalfile/LMI_UnixFileProvider.c index 9c9be79..b9be867 100644 --- a/src/logicalfile/LMI_UnixFileProvider.c +++ b/src/logicalfile/LMI_UnixFileProvider.c @@ -68,7 +68,7 @@ static struct selabel_handle *get_selabel_handle() static void LMI_UnixFileInitialize() { - lmi_init_logging(LMI_UnixFile_ClassName, _cb); + lmi_init(provider_name, _cb, provider_config_defaults); #ifdef LOGICALFILE_SELINUX pthread_mutex_init(&selinux_mutex, NULL); #endif diff --git a/src/logicalfile/LMI_UnixSocketProvider.c b/src/logicalfile/LMI_UnixSocketProvider.c index ca12d53..2da6aad 100644 --- a/src/logicalfile/LMI_UnixSocketProvider.c +++ b/src/logicalfile/LMI_UnixSocketProvider.c @@ -25,6 +25,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_UnixSocketInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_UnixSocketCleanup( diff --git a/src/logicalfile/file.c b/src/logicalfile/file.c index 7a3cfac..3e9c834 100644 --- a/src/logicalfile/file.c +++ b/src/logicalfile/file.c @@ -19,6 +19,10 @@ */ #include "file.h" +const ConfigEntry *provider_config_defaults = NULL; +const char *provider_name = "logicalfile"; + + CMPIStatus lmi_check_required( const CMPIBroker *b, const CMPIObjectPath *o) diff --git a/src/logicalfile/file.h b/src/logicalfile/file.h index b84dc34..953ff18 100644 --- a/src/logicalfile/file.h +++ b/src/logicalfile/file.h @@ -45,6 +45,9 @@ #define PATH_MAX 4096 #endif +const ConfigEntry *provider_config_defaults; +const char *provider_name; + #define FSCREATIONCLASSNAME "LMI_LocalFileSystem" #define GROUP_COMPONENT "GroupComponent" #define PART_COMPONENT "PartComponent" diff --git a/src/power/power.c b/src/power/power.c index fdfeca7..857dba4 100644 --- a/src/power/power.c +++ b/src/power/power.c @@ -34,6 +34,10 @@ #include <upower.h> #endif +const char *provider_name = "powermanagement"; +const ConfigEntry *provider_config_defaults = NULL; + + struct _Power { unsigned int instances; unsigned short requestedPowerState; @@ -67,6 +71,7 @@ Power *_power = NULL; Power *power_new(const CMPIBroker *_cb) { + lmi_init(provider_name, _cb, provider_config_defaults); Power *power = malloc(sizeof(Power)); power->broker = _cb; power->instances = 0; diff --git a/src/power/power.h b/src/power/power.h index a52eaef..75b8ea0 100644 --- a/src/power/power.h +++ b/src/power/power.h @@ -22,9 +22,12 @@ #define POWER_H #include <glib.h> +#include <openlmi.h> + +const char *provider_name; +const ConfigEntry *provider_config_defaults; typedef struct _Power Power; -typedef struct _CMPIBroker CMPIBroker; typedef struct _PowerStateChangeJob PowerStateChangeJob; /** diff --git a/src/realmd/LMI_HostedRealmdServiceProvider.c b/src/realmd/LMI_HostedRealmdServiceProvider.c index 1a9f399..1c06368 100644 --- a/src/realmd/LMI_HostedRealmdServiceProvider.c +++ b/src/realmd/LMI_HostedRealmdServiceProvider.c @@ -8,6 +8,7 @@ static const CMPIBroker* _cb; static void LMI_HostedRealmdServiceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_HostedRealmdServiceCleanup( diff --git a/src/realmd/LMI_RealmdServiceProvider.c b/src/realmd/LMI_RealmdServiceProvider.c index fa4f834..bd713b8 100644 --- a/src/realmd/LMI_RealmdServiceProvider.c +++ b/src/realmd/LMI_RealmdServiceProvider.c @@ -61,6 +61,7 @@ get_joined_domain(GVariant *provider_props) static void LMI_RealmdServiceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_RealmdServiceCleanup( diff --git a/src/realmd/rdcp_util.c b/src/realmd/rdcp_util.c index 73ba17b..30cb790 100644 --- a/src/realmd/rdcp_util.c +++ b/src/realmd/rdcp_util.c @@ -3,6 +3,9 @@ #define VERBOSE +const char *provider_name = "realmd"; +const ConfigEntry *provider_config_defaults = NULL; + void print_properties (GVariant *properties, gchar *format, ...) { diff --git a/src/realmd/rdcp_util.h b/src/realmd/rdcp_util.h index aef255a..4936ddb 100644 --- a/src/realmd/rdcp_util.h +++ b/src/realmd/rdcp_util.h @@ -8,6 +8,10 @@ #include <glib.h> #include "rdcp_error.h" +#include "openlmi.h" + +const char *provider_name; +const ConfigEntry *provider_config_defaults; #define ORGID "LMI_Realmd" #define REALMD_SERVICE_NAME "OpenLMI Realmd Service" diff --git a/src/service-dbus/LMI_ServiceProvider.c b/src/service-dbus/LMI_ServiceProvider.c index 372ad9a..e1329c7 100644 --- a/src/service-dbus/LMI_ServiceProvider.c +++ b/src/service-dbus/LMI_ServiceProvider.c @@ -29,6 +29,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_ServiceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ServiceCleanup( diff --git a/src/service-dbus/util/serviceutil.c b/src/service-dbus/util/serviceutil.c index 70127fe..ac933c5 100644 --- a/src/service-dbus/util/serviceutil.c +++ b/src/service-dbus/util/serviceutil.c @@ -39,6 +39,9 @@ #define SERVICE_INTERFACE "org.freedesktop.systemd1.Service" #define PROPERTY_INTERFACE "org.freedesktop.DBus.Properties" +const char *provider_name = "service"; +const ConfigEntry *provider_config_defaults = NULL; + void service_free_slist(SList *slist) { int i; diff --git a/src/service-dbus/util/serviceutil.h b/src/service-dbus/util/serviceutil.h index 4b54aaf..020cfb7 100644 --- a/src/service-dbus/util/serviceutil.h +++ b/src/service-dbus/util/serviceutil.h @@ -23,9 +23,13 @@ #define SERVICEUTIL_H #include <stdio.h> +#include "openlmi.h" #define ARRAY_SIZE(name) (sizeof(name) / sizeof(name[0])) +const char *provider_name; +const ConfigEntry *provider_config_defaults; + enum OperationalStatus {OS_UNKNOWN = 0, OS_OK = 2, OS_ERROR = 6, OS_STARTING = 8, OS_STOPPING = 9, OS_STOPPED = 10, OS_COMPLETED = 17}; enum ServiceEnabledDefault {ENABLED = 2, DISABLED = 3, NOT_APPLICABLE = 5}; diff --git a/src/service/LMI_ServiceProvider.c b/src/service/LMI_ServiceProvider.c index 7c8ffdb..9e15eed 100644 --- a/src/service/LMI_ServiceProvider.c +++ b/src/service/LMI_ServiceProvider.c @@ -29,6 +29,7 @@ static const CMPIBroker* _cb = NULL; static void LMI_ServiceInitialize() { + lmi_init(provider_name, _cb, provider_config_defaults); } static CMPIStatus LMI_ServiceCleanup( diff --git a/src/service/util/serviceutil.c b/src/service/util/serviceutil.c index bb8a472..72fe51d 100644 --- a/src/service/util/serviceutil.c +++ b/src/service/util/serviceutil.c @@ -36,6 +36,9 @@ char *suscript = "/usr/libexec/serviceutil.sh"; char *sdscript = "/usr/libexec/servicedisc.sh"; +const char *provider_name = "service"; +const ConfigEntry *provider_config_defaults = NULL; + typedef struct { FILE *fp; FILE *fp2; diff --git a/src/service/util/serviceutil.h b/src/service/util/serviceutil.h index 055f43f..776a3c8 100644 --- a/src/service/util/serviceutil.h +++ b/src/service/util/serviceutil.h @@ -26,6 +26,9 @@ #define ARRAY_SIZE(name) (sizeof(name) / sizeof(name[0])) +const char *provider_name; +const ConfigEntry *provider_config_defaults; + enum ServiceEnabledDefault { ENABLED = 2, DISABLED = 3, NOT_APPICABLE = 5}; struct _Service { |