From ea2951995db2bafa1ffb466914128b04b33656b4 Mon Sep 17 00:00:00 2001 From: Rafal Krypa Date: Fri, 20 Jun 2014 17:53:48 +0200 Subject: [PATCH] Remove API for setting allowed users for an app Removed function security_manager_app_inst_req_add_allowed_user. It became obsolete when application framework switched to multi-user support by installing apps for each user separately. Change-Id: I2c1d3533982d23b45f3226e5eb07619d60b0530f Signed-off-by: Rafal Krypa --- src/include/security-manager.h | 10 ---------- src/server/client/client-security-manager.cpp | 12 ------------ src/server/common/protocols.h | 1 - src/server/service/installer.cpp | 1 - 4 files changed, 24 deletions(-) diff --git a/src/include/security-manager.h b/src/include/security-manager.h index ddcd599..2de9c3d 100644 --- a/src/include/security-manager.h +++ b/src/include/security-manager.h @@ -163,16 +163,6 @@ int security_manager_app_inst_req_set_app_id(app_inst_req *p_req, const char *ap int security_manager_app_inst_req_set_pkg_id(app_inst_req *p_req, const char *pkg_id); /* - * This function is used to add allowed user to app_inst_req structure, - * it can be called multiple times - * - * \param[in] Pointer handling app_inst_req structure - * \param[in] Privileged user identifier - * \return API return code or error code - */ -int security_manager_app_inst_req_add_allowed_user(app_inst_req *p_req, const uid_t user_id); - -/* * This function is used to add privilege to app_inst_req structure, * it can be called multiple times * diff --git a/src/server/client/client-security-manager.cpp b/src/server/client/client-security-manager.cpp index e83115d..bab0e96 100644 --- a/src/server/client/client-security-manager.cpp +++ b/src/server/client/client-security-manager.cpp @@ -83,17 +83,6 @@ int security_manager_app_inst_req_set_pkg_id(app_inst_req *p_req, const char *pk } SECURITY_MANAGER_API -int security_manager_app_inst_req_add_allowed_user(app_inst_req *p_req, const uid_t user_id) -{ - if (!p_req) - return SECURITY_MANAGER_ERROR_INPUT_PARAM; - - p_req->allowedUsers.push_back(user_id); - - return SECURITY_MANAGER_SUCCESS; -} - -SECURITY_MANAGER_API int security_manager_app_inst_req_add_privilege(app_inst_req *p_req, const char *privilege) { if (!p_req || !privilege) @@ -134,7 +123,6 @@ int security_manager_app_install(const app_inst_req *p_req) Serialization::Serialize(send, (int)SecurityModuleCall::APP_INSTALL); Serialization::Serialize(send, p_req->appId); Serialization::Serialize(send, p_req->pkgId); - Serialization::Serialize(send, p_req->allowedUsers); Serialization::Serialize(send, p_req->privileges); Serialization::Serialize(send, p_req->appPaths); diff --git a/src/server/common/protocols.h b/src/server/common/protocols.h index 85398e8..90e60b2 100644 --- a/src/server/common/protocols.h +++ b/src/server/common/protocols.h @@ -31,7 +31,6 @@ struct app_inst_req { std::string appId; std::string pkgId; - std::vector allowedUsers; std::vector privileges; std::vector> appPaths; }; diff --git a/src/server/service/installer.cpp b/src/server/service/installer.cpp index 15faa2d..574cac8 100644 --- a/src/server/service/installer.cpp +++ b/src/server/service/installer.cpp @@ -371,7 +371,6 @@ bool InstallerService::processAppInstall(MessageBuffer &buffer, MessageBuffer &s app_inst_req req; Deserialization::Deserialize(buffer, req.appId); Deserialization::Deserialize(buffer, req.pkgId); - Deserialization::Deserialize(buffer, req.allowedUsers); Deserialization::Deserialize(buffer, req.privileges); Deserialization::Deserialize(buffer, req.appPaths); -- 2.7.4