Remove security-server dependency

Signed-off-by: Ji-hoon Jung <jh8801.jung@samsung.com>
Change-Id: I415c9c188d178afafdb1cbd63f5b0e479165d0e4

diff --git a/packaging/smartcard-service.spec b/packaging/smartcard-service.spec
index 84e86b92cee0a7c2f31896602610f99bb6ad9b4a..d79a25535cc0fcb7c4e0d48fe81c89989171359b 100644 (file)
--- a/packaging/smartcard-service.spec
+++ b/packaging/smartcard-service.spec
@@ -20,7 +20,6 @@ Source1004:   smartcard-service-common-devel.manifest
 Source1005:    smartcard-service-server.manifest
 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 c3c26d1ba7bf16dbc3e902a6c3026d2d62ed28d3..a28719825d8ea1780cc24b08249158f341ea1556 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/common/include)
 
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/ SRCS)
 
-pkg_check_modules(pkgs_server REQUIRED glib-2.0 gio-2.0 gio-unix-2.0 security-server dlog)
+pkg_check_modules(pkgs_server REQUIRED glib-2.0 gio-2.0 gio-unix-2.0 dlog)
 FOREACH(flag ${pkgs_server_CFLAGS})
        SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}")
 ENDFOREACH(flag)

diff --git a/server/ServerGDBus.cpp b/server/ServerGDBus.cpp
index f0f1b08b7b33d762cefffe355b6548eefd664821..1a6a7870a44a93e7da6bea4c60e19d61d07a21be 100644 (file)
--- a/server/ServerGDBus.cpp
+++ b/server/ServerGDBus.cpp
@@ -21,10 +21,6 @@
 #include <string>
 #include <sys/socket.h>
 
-#ifdef USER_SPACE_SMACK
-#include "security-server.h"
-#endif
-
 #include "smartcard-types.h"
 #include "Debug.h"
 #include "ByteArray.h"
@@ -287,25 +283,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
+               /*TODO : apply cynara api */
                return result;
        }