diff options
| author | Jihoon Jung <jh8801.jung@samsung.com> | 2015-07-09 11:11:23 +0900 |
|---|---|---|
| committer | Jihoon Jung <jh8801.jung@samsung.com> | 2015-07-09 11:12:04 +0900 |
| commit | 75ed6fedbde1601b1619ddb3a56b674a005b8974 (patch) | |
| tree | f8983bf37d2ea34d039709359c8f8406d02fbd08 | |
| parent | 435d6803bfd82a1d67b178e15a096592426fd87b (diff) | |
| download | smartcard-service-tizen_3.0.m1_tv.tar.gz smartcard-service-tizen_3.0.m1_tv.tar.bz2 smartcard-service-tizen_3.0.m1_tv.zip | |
remove security-server dependencytizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_common/20151026.085049submit/tizen_common/20151023.083358submit/tizen/20150709.021829accepted/tizen/wearable/20150709.054427accepted/tizen/tv/20150709.054418accepted/tizen/mobile/20150709.054400tizen_3.0.m1_tvtizen_3.0.m1_mobile
Change-Id: I3a85232a5d9b716a77ddae06727d07e8870547cf
Signed-off-by: Ji-hoon Jung <jh8801.jung@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | packaging/smartcard-service.spec | 1 | ||||
| -rw-r--r-- | server/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | server/ServerGDBus.cpp | 23 | ||||
| -rw-r--r-- | server/private/AccessControl.cpp | 17 |
5 files changed, 1 insertions, 45 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ee5ffee..834abff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,9 +4,6 @@ MESSAGE("build smartcard-service") SET(CMAKE_VERBOSE_MAKEFILE OFF) -# apply smack -ADD_DEFINITIONS("-DUSER_SPACE_SMACK") - IF(DEFINED USE_AUTOSTART) ADD_DEFINITIONS("-DUSE_AUTOSTART") ENDIF() diff --git a/packaging/smartcard-service.spec b/packaging/smartcard-service.spec index c9a9970..cf565ce 100644 --- a/packaging/smartcard-service.spec +++ b/packaging/smartcard-service.spec @@ -18,7 +18,6 @@ Source1: %{name}-server.init BuildRequires: cmake BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-unix-2.0) -BuildRequires: pkgconfig(security-server) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(aul) BuildRequires: pkgconfig(libssl) diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index d5c068b..0d1dd81 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -29,7 +29,7 @@ ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "") # pkg config INCLUDE(FindPkgConfig) -SET(PKG_MODULE glib-2.0 gio-2.0 gio-unix-2.0 security-server dlog) +SET(PKG_MODULE glib-2.0 gio-2.0 gio-unix-2.0 dlog) pkg_check_modules(pkgs_server REQUIRED ${PKG_MODULE}) diff --git a/server/ServerGDBus.cpp b/server/ServerGDBus.cpp index 44e6b54..55a1118 100644 --- a/server/ServerGDBus.cpp +++ b/server/ServerGDBus.cpp @@ -22,11 +22,6 @@ #include <string> #include <sys/socket.h> -/* SLP library header */ -#ifdef USER_SPACE_SMACK -#include "security-server.h" -#endif - /* local header */ #include "smartcard-types.h" #include "Debug.h" @@ -300,25 +295,7 @@ namespace smartcard_service_api const char *rights) { bool result = true; -#ifdef USER_SPACE_SMACK - pid_t pid; - const char *name; - ClientInstance *instance; - - name = g_dbus_method_invocation_get_sender(invocation); - instance = ServerResource::getInstance().getClient(name); - if (instance != NULL) { - pid = instance->getPID(); - } else { - pid = ServerGDBus::getInstance().getPID(name); - } - - result = (security_server_check_privilege_by_pid( - pid, - "smartcard-service", - rights) == SECURITY_SERVER_API_SUCCESS); -#endif return result; } diff --git a/server/private/AccessControl.cpp b/server/private/AccessControl.cpp index 4b78232..b349818 100644 --- a/server/private/AccessControl.cpp +++ b/server/private/AccessControl.cpp @@ -19,11 +19,6 @@ #include <gio/gio.h> #include <map> -/* SLP library header */ -#ifdef USER_SPACE_SMACK -#include "security-server.h" -#endif - /* local header */ #include "Debug.h" #include "APDUHelper.h" @@ -121,19 +116,7 @@ static bool _is_authorized_request(GDBusMethodInvocation *invocation, const char *rights) { bool result = true; -#ifdef USER_SPACE_SMACK - pid_t pid; - const char *name; - - name = g_dbus_method_invocation_get_sender(invocation); - - pid = ServerGDBus::getInstance().getPID(name); - result = (security_server_check_privilege_by_pid( - pid, - "smartcard-service::priv", - rights) == SECURITY_SERVER_API_SUCCESS); -#endif return result; } |