diff options
| -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} |