const char* const ENFORCING = "Enforcing";
const char* const DISABLED = "Disabled";
const char* const READY = "Ready";
+const char* const UNSET = "Unset"; // Meaningless value for unset.
+const char* const USER_LABEL = "User";
const char* const CKM_LOCK = "/var/run/key-manager.pid";
-// disable CC
-int _unset_mdpp_key = vconf_unset(VCONFKEY_SECURITY_MDPP_STATE);
-
// Wrapper for mdpp state that restores the original value upon destruction
class MdppState
{
MdppState::MdppState()
{
+ ScopedLabel sl(USER_LABEL);
m_original = vconf_get_str(VCONFKEY_SECURITY_MDPP_STATE);
}
MdppState::~MdppState()
{
+ ScopedLabel sl(USER_LABEL);
if (!m_original)
- vconf_unset(VCONFKEY_SECURITY_MDPP_STATE);
+ vconf_set_str(VCONFKEY_SECURITY_MDPP_STATE, UNSET);
else {
vconf_set_str(VCONFKEY_SECURITY_MDPP_STATE, m_original);
- free(m_original);
}
}
void MdppState::set(const char* const value)
{
+ ScopedLabel sl(USER_LABEL);
if (value)
- RUNNER_ASSERT_MSG(0 == vconf_set_str(VCONFKEY_SECURITY_MDPP_STATE, value),
- "vconf_set() failed");
+ {
+ int ret = vconf_set_str(VCONFKEY_SECURITY_MDPP_STATE, value);
+ RUNNER_ASSERT_MSG(0 == ret,
+ "vconf_set() failed, ec: " << ret);
+ }
else
- vconf_unset(VCONFKEY_SECURITY_MDPP_STATE);
+ vconf_set_str(VCONFKEY_SECURITY_MDPP_STATE, UNSET);
}
void remove_user_data()