Fix registering provides-appdefined-privileges

security-manager manages security context per app, not package.
And it doesn't allow two apps to define same provides-appdefined-privileges.

Change-Id: I26163da2b0cc11ddfee0924838067f26ccc84829
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/src/common/security_registration.cc b/src/common/security_registration.cc
index 5c1eace..e9826c3 100644 (file)
--- a/src/common/security_registration.cc
+++ b/src/common/security_registration.cc
@@ -341,11 +341,14 @@ bool RegisterSecurityContextForManifest(
     }
     list_index++;
     bool is_web_priv = strcmp(app->type, "webapp") == 0;
+    bool is_mainapp = strcmp(app->mainapp, "true") == 0;
     if (!PrepareRequest(app->appid, pkg_id, cert_info->author_id.get(),
         app->api_version, path, uid,
         is_web_priv ? wgt_priv_vec : tpk_priv_vec,
         is_web_priv ? wgt_appdef_vec : tpk_appdef_vec,
-        is_web_priv ? wgt_provides_appdef_vec : tpk_provides_appdef_vec,
+        is_mainapp ? (is_web_priv ? wgt_provides_appdef_vec :
+                                    tpk_provides_appdef_vec) :
+                     AppDefinedPrivInfo(),
         req, cross_app_rules, error_message)) {
       LOG(ERROR) << "Failed while preparing security_manager_app_inst_req";
       security_manager_app_inst_req_free(req);