Before applied a label on the process context, check if the label is previously set.

Wrt-installer could be compiled with SMACK OPTION to off.
In consequences, the smack label on the binary symbol link is not set.

So we can't applied this label in this case.
It better to use set_smack_from_binary instead of set_smack_for_wrt

Fix for TIVI-1119 & TZ-3514

Change-Id: Ie69136b3de04d79e6f6ac8bbc3be3f19e06fd808

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e21f536..150f485 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,7 @@ ADD_DEFINITIONS("-Wall -Werror")
 #ADD_DEFINITIONS("-DSMACK_ENABLED")
 #ADD_DEFINITIONS("-DDLOG_DEBUG_ENABLED")    #enables dlogutil logs
 ADD_DEFINITIONS("-DDLOG_ERROR_ENABLED")
+ADD_DEFINITIONS("-Wno-unused-function")
 
 ###################################################################################################
 ## for libprivilege-control.so (library)

diff --git a/packaging/libprivilege-control.changes b/packaging/libprivilege-control.changes
index ae21e04..94ac09f 100644 (file)
--- a/packaging/libprivilege-control.changes
+++ b/packaging/libprivilege-control.changes
@@ -1,3 +1,6 @@
+* Thu Jul 11 2013 Rusty Lynch <rusty.lynch@intel.com> accepted/tizen/20130711.163636@43b59bc
+- Before applied a label on the process context, check if the label is previously set.
+
 * Thu Jul 11 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130711.003907@5533929
 - cleanup spec
 - - remove init.d scripts

diff --git a/src/privilege-control.c b/src/privilege-control.c
index 92997b4..a361968 100644 (file)
--- a/src/privilege-control.c
+++ b/src/privilege-control.c
@@ -508,7 +508,10 @@ API int set_app_privilege(const char* name, const char* type, const char* path)
                        ret = PC_ERR_INVALID_PARAM;
                }
                else
-                       ret = set_smack_for_wrt(&smack_label, widget_id);
+               {
+                       smack_label = strdup(widget_id);
+                       ret = set_smack_from_binary(&smack_label, path);
+               }
                break;
        default:
                if (path != NULL)
@@ -727,7 +730,6 @@ static int set_smack_for_wrt(char **smack_label, const char* widget_id)
                C_LOGE("smack_set_label_for_self failed");
                return PC_ERR_INVALID_OPERATION;
        }
-
        return PC_OPERATION_SUCCESS;
 }