Removed security server logic to be replaced as cynara.

Currently, imemanager privilege is not exist. So after ime manager privilege is decided in Tizen 2.4. we will add the cynara check logic.

Change-Id: I1b69ac14c7d2fae3c57fa0b931b11d46ce5a587a

diff --git a/configure.ac b/configure.ac
index d870565..aee90ed 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -290,9 +290,6 @@ if test "$ISF_HAS_TTS" = "yes"; then
   AC_DEFINE(HAVE_TTS,1,[Have TTS functions.])
 fi
 
-# Check security server
-PKG_CHECK_MODULES(SECURITY_SERVER, [security-server])
-
 # Check vconf library
 PKG_CHECK_MODULES(VCONF, [vconf],
                   [ISF_HAS_VCONF=yes],

diff --git a/ism/src/Makefile.am b/ism/src/Makefile.am
index d44cfd2..1de11e1 100644 (file)
--- a/ism/src/Makefile.am
+++ b/ism/src/Makefile.am
@@ -142,7 +142,7 @@ libscim@SCIM_EPOCH@_la_SOURCES = \
                          isf_imcontrol_client.cpp \
                          isf_query_utility.cpp
 
-libscim@SCIM_EPOCH@_la_CXXFLAGS = @EFL_CFLAGS@ @DLOG_CFLAGS@ @SECURITY_SERVER_CFLAGS@ @VCONF_CFLAGS@ @TZPLATFORM_CONFIG_CFLAGS@
+libscim@SCIM_EPOCH@_la_CXXFLAGS = @EFL_CFLAGS@ @DLOG_CFLAGS@ @VCONF_CFLAGS@ @TZPLATFORM_CONFIG_CFLAGS@
 
 libscim@SCIM_EPOCH@_la_LDFLAGS  = -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$(SCIM_AGE) \
                          -export-dynamic \
@@ -152,7 +152,6 @@ libscim@SCIM_EPOCH@_la_LDFLAGS  = -version-info $(SCIM_CURRENT):$(SCIM_REVISION)
                          @LIBTOOL_EXPORT_OPTIONS@ \
                          @LIBICONV@ \
                          @LTLIBINTL@ \
-                         @SECURITY_SERVER_LIBS@ \
                          @EFL_LIBS@ \
                          @VCONF_LIBS@ \
                          @TZPLATFORM_CONFIG_LIBS@ \

diff --git a/ism/src/scim_panel_agent.cpp b/ism/src/scim_panel_agent.cpp
index c78bfcf..c5eb567 100644 (file)
--- a/ism/src/scim_panel_agent.cpp
+++ b/ism/src/scim_panel_agent.cpp
@@ -65,7 +65,6 @@
 #include "scim_private.h"
 #include "scim.h"
 #include "scim_stl_map.h"
-#include "security-server.h"
 
 
 EAPI scim::CommonLookupTable g_isf_candidate_table;
@@ -3763,26 +3762,12 @@ private:
                 if (cmd == ISM_TRANS_CMD_GET_ACTIVE_ISE)
                     get_active_ise (client_id);
                 else if (cmd == ISM_TRANS_CMD_SET_ACTIVE_ISE_BY_UUID) {
-                    ISF_SAVE_LOG ("checking sockfd privilege...\n");
-                    int ret = security_server_check_privilege_by_sockfd (client_id, "isf::manager", "w");
-                    if (ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED) {
-                        SCIM_DEBUG_MAIN (2) <<"Security server api error. Access denied\n";
-                    } else {
-                        SCIM_DEBUG_MAIN (2) <<"Security server api success\n";
-                        ISF_SAVE_LOG ("setting active ise\n");
-                        set_active_ise_by_uuid (client_id);
-                    }
+                    ISF_SAVE_LOG ("setting active ise\n");
+                    set_active_ise_by_uuid (client_id);
                 }
                 else if (cmd == ISM_TRANS_CMD_SET_INITIAL_ISE_BY_UUID) {
-                    ISF_SAVE_LOG ("checking sockfd privilege...\n");
-                    int ret = security_server_check_privilege_by_sockfd (client_id, "isf::manager", "w");
-                    if (ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED) {
-                        SCIM_DEBUG_MAIN (2) <<"Security server api error. Access denied\n";
-                    } else {
-                        SCIM_DEBUG_MAIN (2) <<"Security server api success\n";
-                        ISF_SAVE_LOG ("setting initial ise\n");
-                        set_initial_ise_by_uuid (client_id);
-                    }
+                    ISF_SAVE_LOG ("setting initial ise\n");
+                    set_initial_ise_by_uuid (client_id);
                 }
                 else if (cmd == ISM_TRANS_CMD_GET_ISE_LIST)
                     get_ise_list (client_id);

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 7b4c321..7e75dd2 100644 (file)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -29,7 +29,6 @@ BuildRequires:  pkgconfig(edje)
 BuildRequires:  pkgconfig(notification)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(tts)
-BuildRequires:  pkgconfig(security-server)
 BuildRequires:  pkgconfig(edbus)
 BuildRequires:  pkgconfig(capi-network-bluetooth)
 BuildRequires:  efl-extension-devel