diff options
| author | sangwan.kwon <sangwan.kwon@samsung.com> | 2017-01-20 15:41:14 +0900 |
|---|---|---|
| committer | sangwan.kwon <sangwan.kwon@samsung.com> | 2017-01-20 15:46:35 +0900 |
| commit | 940cfc9b5c1f9aa9d001913e7b96b48f8e45c24c (patch) | |
| tree | c144c59b00d7df9df985598919e49476a8163171 | |
| parent | c68a643072ce7d7fb43a50aa6621f9e0f86c7d33 (diff) | |
| download | auth-fw-accepted/tizen/common/20170120.125147.tar.gz auth-fw-accepted/tizen/common/20170120.125147.tar.bz2 auth-fw-accepted/tizen/common/20170120.125147.zip | |
Remove mobile dependency on the whitelistsubmit/tizen_unified/20170308.100408submit/tizen/20170120.075658accepted/tizen/wearable/20170120.122038accepted/tizen/unified/20170309.033222accepted/tizen/tv/20170120.122020accepted/tizen/mobile/20170120.122004accepted/tizen/ivi/20170120.122059accepted/tizen/common/20170120.125147accepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_common
* 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>
| -rw-r--r-- | conf/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | conf/client-whitelist | 6 | ||||
| -rw-r--r-- | conf/client-whitelist_mobile | 8 | ||||
| -rw-r--r-- | packaging/auth-fw.spec | 3 |
4 files changed, 8 insertions, 15 deletions
diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt index c0aaf8b..7178786 100644 --- 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 8e5a96c..a066890 100644 --- 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 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 1808ee2..423b4f8 100644 --- 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} |