Change in setup path.

[Issue#]       SSDWSSP-183
[Bug/Feature]  N/A
[Cause]        N/A
[Solution]     N/A
[Verification] N/A

Change-Id: I299003f07c06230ce16e229bd525de1e9bc94218

diff --git a/src/privilege-control.c b/src/privilege-control.c
index 9a99733..0549b96 100644 (file)
--- a/src/privilege-control.c
+++ b/src/privilege-control.c
@@ -1282,16 +1282,16 @@ static int perm_app_setup_path_internal(const char* pkg_id, const char* path, ap
                        return PC_ERR_INVALID_PARAM;
                }
 
-               // Add the path to the database:
-               ret = rdb_add_path(pkg_id, shared_label, path, "rwxatl", "GROUP_PATH");
+               ret = app_label_shared_dir(pkg_id, shared_label, path);
                if (ret != PC_OPERATION_SUCCESS) {
-                       C_LOGE("RDB rdb_add_path failed with: %d", ret);
+                       C_LOGE("app_label_shared_dir failed: %d", ret);
                        return ret;
                }
 
-               ret = app_label_shared_dir(pkg_id, shared_label, path);
+               // Add the path to the database:
+               ret = rdb_add_path(pkg_id, shared_label, path, "rwxatl", "GROUP_PATH");
                if (ret != PC_OPERATION_SUCCESS) {
-                       C_LOGE("app_label_shared_dir failed: %d", ret);
+                       C_LOGE("RDB rdb_add_path failed with: %d", ret);
                        return ret;
                }
 
@@ -1314,18 +1314,19 @@ static int perm_app_setup_path_internal(const char* pkg_id, const char* path, ap
                }
                C_LOGD("Generated label '%s' for public RO path %s", label, path);
 
-               // Add the path to the database:
-               ret = rdb_add_path(pkg_id, label, path, "rwxatl", "PUBLIC_PATH");
+               ret = app_label_shared_dir(pkg_id, label, path);
                if (ret != PC_OPERATION_SUCCESS) {
-                       C_LOGE("RDB rdb_add_path failed with: %d", ret);
+                       C_LOGE("app_label_shared_dir failed.");
                        return ret;
                }
 
-               ret = app_label_shared_dir(pkg_id, label, path);
+               // Add the path to the database:
+               ret = rdb_add_path(pkg_id, label, path, "rwxatl", "PUBLIC_PATH");
                if (ret != PC_OPERATION_SUCCESS) {
-                       C_LOGE("app_label_shared_dir failed.");
+                       C_LOGE("RDB rdb_add_path failed with: %d", ret);
                        return ret;
                }
+
                return PC_OPERATION_SUCCESS;
        }
 
@@ -1343,6 +1344,12 @@ static int perm_app_setup_path_internal(const char* pkg_id, const char* path, ap
                }
                C_LOGD("Appsetting: generated label '%s' for setting path %s", label, path);
 
+               /*set id for path and all subfolders*/
+               ret = app_label_shared_dir(pkg_id, label, path);
+               if (ret != PC_OPERATION_SUCCESS) {
+                       C_LOGE("Appsetting: app_label_shared_dir failed (%d)", ret);
+                       return ret;
+               }
 
                // Add the path to the database:
                ret = rdb_add_path(pkg_id, label, path, "rwxatl", "SETTINGS_PATH");
@@ -1351,12 +1358,6 @@ static int perm_app_setup_path_internal(const char* pkg_id, const char* path, ap
                        return ret;
                }
 
-               /*set id for path and all subfolders*/
-               ret = app_label_shared_dir(pkg_id, label, path);
-               if (ret != PC_OPERATION_SUCCESS) {
-                       C_LOGE("Appsetting: app_label_shared_dir failed (%d)", ret);
-                       return ret;
-               }
                return PC_OPERATION_SUCCESS;
        }
 

diff --git a/src/rules-db.c b/src/rules-db.c
index 9a680b5..6aa633b 100644 (file)
--- a/src/rules-db.c
+++ b/src/rules-db.c
@@ -274,7 +274,7 @@ int rdb_enable_app_permissions(const char *const s_app_label_name,
                               const char *const *const pp_permissions_list,
                               const bool   b_is_volatile)
 {
-       RDB_LOG_ENTRY_PARAM("%s %s %d", s_app_label_name, s_permission_type_name, b_is_volatile);
+       RDB_LOG_ENTRY_PARAM("%s %s %d", s_app_label_name, s_permission_type_name,(int)b_is_volatile);
 
        int ret = PC_ERR_DB_OPERATION;
        sqlite3 *p_db = NULL;