diff options
Diffstat (limited to 'src/account/LMI_AccountManagementServiceProvider.c')
| -rw-r--r-- | src/account/LMI_AccountManagementServiceProvider.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/account/LMI_AccountManagementServiceProvider.c b/src/account/LMI_AccountManagementServiceProvider.c index 21473ea..e0e6f89 100644 --- a/src/account/LMI_AccountManagementServiceProvider.c +++ b/src/account/LMI_AccountManagementServiceProvider.c @@ -27,7 +27,6 @@ #include "LMI_Group.h" #include "macros.h" -#include "globals.h" #include "aux_lu.h" #include "account_globals.h" @@ -57,7 +56,7 @@ static void LMI_AccountManagementServiceInitialize(const CMPIContext *ctx) { lmi_init(provider_name, _cb, ctx, provider_config_defaults); if (init_lock_pools() == 0) { - error("Unable to initialize lock pool."); + lmi_error("Unable to initialize lock pool."); exit (1); } } @@ -285,7 +284,7 @@ KUint32 LMI_AccountManagementService_CreateGroup( pwdlockres = lckpwdf(); if (pwdlockres != 0) - warn("Cannot acquire passwd file lock\n"); + lmi_warn("Cannot acquire passwd file lock\n"); luc = lu_start(NULL, lu_user, NULL, NULL, lu_prompt_console_quiet, NULL, &error); @@ -341,7 +340,7 @@ KUint32 LMI_AccountManagementService_CreateGroup( /* Output created group identity */ KRefA_Init(Identities, cb, 1); LMI_IdentityRef_Init(&Identityref, cb, nameSpace); - asprintf(&instanceid, ORGID":GID:%ld", aux_lu_get_long(lue, LU_GIDNUMBER)); + asprintf(&instanceid, LMI_ORGID":GID:%ld", aux_lu_get_long(lue, LU_GIDNUMBER)); LMI_IdentityRef_Set_InstanceID(&Identityref, instanceid); free(instanceid); IdentityOP = LMI_IdentityRef_ToObjectPath(&Identityref, NULL); @@ -429,7 +428,7 @@ KUint32 LMI_AccountManagementService_CreateAccount( pwdlockres = lckpwdf(); if (pwdlockres != 0) - warn("Cannot acquire passwd file lock\n"); + lmi_warn("Cannot acquire passwd file lock\n"); luc = lu_start(NULL, lu_user, NULL, NULL, lu_prompt_console_quiet, NULL, &error); @@ -591,7 +590,7 @@ output: /* Identity of Account */ LMI_IdentityRef_Init(&Identityref, cb, nameSpace); - asprintf(&instanceid, ORGID":UID:%ld", + asprintf(&instanceid, LMI_ORGID":UID:%ld", aux_lu_get_long(lue, LU_UIDNUMBER)); LMI_IdentityRef_Set_InstanceID(&Identityref, instanceid); free(instanceid); @@ -599,7 +598,7 @@ output: KRefA_Set(Identities, 0, IdentityOP); /* Identity of Group */ - asprintf(&instanceid, ORGID":GID:%ld", + asprintf(&instanceid, LMI_ORGID":GID:%ld", aux_lu_get_long(lue, LU_GIDNUMBER)); LMI_IdentityRef_Set_InstanceID(&Identityref, instanceid); free(instanceid); |