Remove mobile dependency on the whitelist

* Preloaded app cannot hold the internal privilege now.
* If the preloaded app can hold internal privilege later,
  the whitelist can be replace with the cynara.

Change-Id: I4e1f9862ea6b5994df61688c77c256ab6c72d534
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>

diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
index c0aaf8b4ff45a830532f15386a2f52b9bf72fd57..7178786caa3abe6213ca0923312acb8e4bb3efb6 100644 (file)
--- a/conf/CMakeLists.txt
+++ b/conf/CMakeLists.txt
@@ -15,10 +15,6 @@
 # @file        CMakeLists.txt
 # @author      Jooseong Lee <jooseong.lee@samsung.com>
 #
-IF("${PROFILE}" STREQUAL "mobile")
-    INSTALL(FILES client-whitelist_mobile DESTINATION ${SYS_CONFIG_DIR}/${SERVICE_NAME} RENAME client-whitelist)
-ELSE("${PROFILE}" STREQUAL "mobile")
-    INSTALL(FILES client-whitelist DESTINATION ${SYS_CONFIG_DIR}/${SERVICE_NAME})
-ENDIF()
 
+INSTALL(FILES client-whitelist DESTINATION ${SYS_CONFIG_DIR}/${SERVICE_NAME})
 INSTALL(FILES admin-client-whitelist DESTINATION ${SYS_CONFIG_DIR}/${SERVICE_NAME})

diff --git a/conf/client-whitelist b/conf/client-whitelist
index 8e5a96c64aa1a1caf49887b5cadf253ddb091b7d..a0668908ec9c8cb17450133c1a6d4dffa06fa611 100644 (file)
--- a/conf/client-whitelist
+++ b/conf/client-whitelist
@@ -1,5 +1,11 @@
 # subject labels allowed to use password checking/setting
 # put each allowed label in new line
+# If the preloaded app can hold internal privilege later,
+# the whitelist would be replaced with cynara.
 System
 System::Privileged
 User
+# This is for the mobile preloaded app.
+User::Pkg::org.tizen.keyguard
+User::Pkg::org.tizen.lockscreen
+User::Pkg::org.tizen.setting

diff --git a/conf/client-whitelist_mobile b/conf/client-whitelist_mobile
deleted file mode 100644 (file)
index 735f9de..0000000
--- a/conf/client-whitelist_mobile
+++ /dev/null
@@ -1,8 +0,0 @@
-# subject labels allowed to use password checking/setting
-# put each allowed label in new line
-System
-System::Privileged
-User
-User::Pkg::org.tizen.keyguard
-User::Pkg::org.tizen.lockscreen
-User::Pkg::org.tizen.setting

diff --git a/packaging/auth-fw.spec b/packaging/auth-fw.spec
index 1808ee2170abc5f458f37be1098b175e3dfd72ad..423b4f8cb06f67c6e4f9709584fc457618457791 100644 (file)
--- a/packaging/auth-fw.spec
+++ b/packaging/auth-fw.spec
@@ -85,8 +85,7 @@ export LDFLAGS+="-Wl,--rpath=%{_libdir}"
         -DSOCK_PASSWD_CHECK=%{sock_passwd_check} \
         -DSOCK_PASSWD_SET=%{sock_passwd_set} \
         -DSOCK_PASSWD_RESET=%{sock_passwd_reset} \
-        -DSOCK_PASSWD_POLICY=%{sock_passwd_policy} \
-        -DPROFILE=%{profile}
+        -DSOCK_PASSWD_POLICY=%{sock_passwd_policy}
 
 make %{?jobs:-j%jobs}