build: Set HAVE_CYNARA default feature

Change-Id: Iba5af00ccf17871d97ed7d9f526e870a51fb0086

diff --git a/meson.build b/meson.build
index 688d8039c5fe5fd6a2e6bc6d339ee0a053731cd1..cce09e6c7b1a94e5dd2a8b0b5cbfcf0733cbc3d8 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -133,20 +133,12 @@ dep_libinput = dependency('libinput', required: true)
 cpp.has_function('libinput_event_touch_get_major', dependencies: dep_libinput, required: true)
 cpp.has_function('libinput_event_pointer_get_scroll_value_v120', dependencies: dep_libinput, required: true)
 
-deps_cynara = []
-dep_cynara_client = dependency('cynara-client')
-dep_cynara_creds_socket = dependency('cynara-creds-socket')
-dep_cynara_session = dependency('cynara-session')
-dep_libsmack = dependency('libsmack')
-if dep_cynara_client.found() == true and dep_cynara_creds_socket.found() == true and dep_cynara_session.found() == true and dep_libsmack.found() == true
-  deps_cynara = [
-    dep_cynara_client,
-    dep_cynara_creds_socket,
-    dep_cynara_session,
-    dep_libsmack,
-  ]
-  config_h.set('HAVE_CYNARA', '1')
-endif
+deps_cynara = [
+  dependency('cynara-client', required: true),
+  dependency('cynara-creds-socket', required: true),
+  dependency('cynara-session', required: true),
+  dependency('libsmack', required: true),
+]
 
 deps_wayland = [
   dependency('wayland-server', version: '>= 1.17.0', required: true),

diff --git a/src/bin/inputmgr/e_keyrouter_keygrab.c b/src/bin/inputmgr/e_keyrouter_keygrab.c
index 7476b05689e816389787c6eddc266ddfc6fec56f..e582359ed84eafbc98a74732e4f76fd4a15f1d43 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_keygrab.c
+++ b/src/bin/inputmgr/e_keyrouter_keygrab.c
@@ -216,7 +216,6 @@ e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, i
    Eina_List *excl_ptr_list;
    int res;
 
-#ifdef HAVE_CYNARA
    if (!_e_keyrouter_keygrab_no_privcheck(key, mode))
      {
         if (!e_keyrouter_wl_keygrab_privilege_check(client))
@@ -225,7 +224,6 @@ e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, i
               return TIZEN_KEYROUTER_ERROR_NO_PERMISSION;
           }
      }
-#endif
 
    if (!surface)
      {
@@ -350,13 +348,11 @@ e_keyrouter_keygrab_unset(struct wl_client *client, struct wl_resource *surface,
 
    g_rec_mutex_unlock(&krt->grab_key_mutex);
 
-#ifdef HAVE_CYNARA
    if (!_e_keyrouter_keygrab_no_privcheck(key, TIZEN_KEYROUTER_MODE_NONE))
      {
         if (!e_keyrouter_wl_keygrab_privilege_check(client))
           goto finish;
      }
-#endif
 
    g_rec_mutex_lock(&krt->grab_key_mutex);
 

diff --git a/src/bin/server/e_devicemgr_wl.c b/src/bin/server/e_devicemgr_wl.c
index 7182450e4c45b94d3d29f908fb2b6471d5873ea3..f0e81f42ae77e207d03eb99e00ba722c90586e70 100644 (file)
--- a/src/bin/server/e_devicemgr_wl.c
+++ b/src/bin/server/e_devicemgr_wl.c
@@ -38,7 +38,6 @@ struct _E_Tizen_Devicemgr_User_Data
 
 static E_Tizen_Devicemgr *g_tizen_devicemgr = NULL;
 
-#ifdef HAVE_CYNARA
 static Eina_Bool
 _e_devicemgr_util_do_privilege_check(struct wl_client *client, const char *rule)
 {
@@ -51,7 +50,6 @@ _e_devicemgr_util_do_privilege_check(struct wl_client *client, const char *rule)
 
    return res;
 }
-#endif
 
 static void
 _e_devicemgr_wl_device_cb_axes_select(struct wl_client *client, struct wl_resource *resource, struct wl_array *axes)
@@ -390,7 +388,6 @@ _e_devicemgr_wl_cb_block_events(struct wl_client *client, struct wl_resource *re
 {
    int ret = TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE;
 
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client,
                                                           "http://tizen.org/privilege/internal/inputdevice.block"))
      {
@@ -398,7 +395,6 @@ _e_devicemgr_wl_cb_block_events(struct wl_client *client, struct wl_resource *re
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    ret = e_devicemgr_block_add(client, resource, clas, duration);
    tizen_input_device_manager_send_error(resource, ret);
@@ -409,7 +405,6 @@ _e_devicemgr_wl_cb_unblock_events(struct wl_client *client, struct wl_resource *
 {
    int ret;
 
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client,
                                                           "http://tizen.org/privilege/internal/inputdevice.block"))
      {
@@ -417,7 +412,6 @@ _e_devicemgr_wl_cb_unblock_events(struct wl_client *client, struct wl_resource *
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    ret = e_devicemgr_block_remove(client);
    tizen_input_device_manager_send_error(resource, ret);
@@ -428,7 +422,6 @@ _e_devicemgr_wl_cb_init_generator(struct wl_client *client, struct wl_resource *
 {
    int ret = TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE;
 
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client,
                                                           "http://tizen.org/privilege/inputgenerator"))
      {
@@ -436,7 +429,6 @@ _e_devicemgr_wl_cb_init_generator(struct wl_client *client, struct wl_resource *
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    ret = e_devicemgr_inputgen_add(client, resource, clas, INPUT_GENERATOR_DEVICE);
    tizen_input_device_manager_send_error(resource, ret);
@@ -447,7 +439,6 @@ _e_devicemgr_wl_cb_init_generator_with_name(struct wl_client *client, struct wl_
 {
    int ret = TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE;
 
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client,
                                                           "http://tizen.org/privilege/inputgenerator"))
      {
@@ -455,7 +446,6 @@ _e_devicemgr_wl_cb_init_generator_with_name(struct wl_client *client, struct wl_
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    ret = e_devicemgr_inputgen_add(client, resource, clas, name);
    tizen_input_device_manager_send_error(resource, ret);
@@ -464,7 +454,6 @@ _e_devicemgr_wl_cb_init_generator_with_name(struct wl_client *client, struct wl_
 static void
 _e_devicemgr_wl_cb_init_generator_with_sync(struct wl_client *client, struct wl_resource *resource, uint32_t clas, const char *name)
 {
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client,
                                                           "http://tizen.org/privilege/inputgenerator"))
      {
@@ -472,7 +461,6 @@ _e_devicemgr_wl_cb_init_generator_with_sync(struct wl_client *client, struct wl_
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    e_devicemgr_inputgen_add_with_sync(client, resource, clas, name);
 }
@@ -482,7 +470,6 @@ _e_devicemgr_wl_cb_deinit_generator(struct wl_client *client, struct wl_resource
 {
    int ret = TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE;
 
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client,
                                                           "http://tizen.org/privilege/inputgenerator"))
      {
@@ -490,7 +477,6 @@ _e_devicemgr_wl_cb_deinit_generator(struct wl_client *client, struct wl_resource
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    e_devicemgr_inputgen_remove(client, resource, clas);
    tizen_input_device_manager_send_error(resource, ret);
@@ -501,7 +487,6 @@ _e_devicemgr_wl_cb_generate_key(struct wl_client *client, struct wl_resource *re
 {
    int ret = TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE;
 
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client,
                                                           "http://tizen.org/privilege/inputgenerator"))
      {
@@ -509,7 +494,6 @@ _e_devicemgr_wl_cb_generate_key(struct wl_client *client, struct wl_resource *re
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    ret = e_devicemgr_inputgen_generate_key(client, resource, keyname, (Eina_Bool)!!pressed);
    tizen_input_device_manager_send_error(resource, ret);
@@ -520,7 +504,6 @@ _e_devicemgr_wl_cb_generate_pointer(struct wl_client *client, struct wl_resource
 {
    int ret = TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE;
 
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client,
                                                           "http://tizen.org/privilege/inputgenerator"))
      {
@@ -528,7 +511,6 @@ _e_devicemgr_wl_cb_generate_pointer(struct wl_client *client, struct wl_resource
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    ret = e_devicemgr_inputgen_generate_pointer(client, resource, type, x, y, button);
    tizen_input_device_manager_send_error(resource, ret);
@@ -539,14 +521,12 @@ _e_devicemgr_wl_cb_generate_touch(struct wl_client *client, struct wl_resource *
 {
    int ret = TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE;
 
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client, "http://tizen.org/privilege/inputgenerator"))
      {
         DMERR("_e_input_devmgr_cb_generate_touch:priv check failed");
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    ret = e_devicemgr_inputgen_generate_touch(client, resource, type, x, y, finger);
    tizen_input_device_manager_send_error(resource, ret);
@@ -573,7 +553,6 @@ _e_devicemgr_wl_cb_generate_axis(struct wl_client *client, struct wl_resource *r
 {
    int ret = TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE;
 
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client,
                                                           "http://tizen.org/privilege/inputgenerator"))
      {
@@ -581,7 +560,6 @@ _e_devicemgr_wl_cb_generate_axis(struct wl_client *client, struct wl_resource *r
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    if (type == TIZEN_INPUT_DEVICE_MANAGER_AXIS_TYPE_WHEEL ||
        type == TIZEN_INPUT_DEVICE_MANAGER_AXIS_TYPE_HWHEEL)
@@ -596,7 +574,6 @@ _e_devicemgr_wl_cb_set_touch_count(struct wl_client *client, struct wl_resource
 {
    int ret = TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE;
 
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client,
                                                           "http://tizen.org/privilege/inputgenerator"))
      {
@@ -604,7 +581,6 @@ _e_devicemgr_wl_cb_set_touch_count(struct wl_client *client, struct wl_resource
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    if (e_config->configured_max_touch.use)
      {
@@ -627,7 +603,6 @@ _e_devicemgr_wl_cb_keyboard_grab(struct wl_client *client, struct wl_resource *r
 {
    int ret = TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE;
 
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client,
                                                           E_PRIVILEGE_INTERNAL_DEFAULT_PLATFORM))
      {
@@ -635,7 +610,6 @@ _e_devicemgr_wl_cb_keyboard_grab(struct wl_client *client, struct wl_resource *r
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    ret = e_devicemgr_keyboard_grab(client, surface, subclas);
    tizen_input_device_manager_send_error(resource, ret);
@@ -647,7 +621,6 @@ _e_devicemgr_wl_cb_keyboard_ungrab(struct wl_client *client, struct wl_resource
 {
    int ret = TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE;
 
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client,
                                                           E_PRIVILEGE_INTERNAL_DEFAULT_PLATFORM))
      {
@@ -655,7 +628,6 @@ _e_devicemgr_wl_cb_keyboard_ungrab(struct wl_client *client, struct wl_resource
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    ret = e_devicemgr_keyboard_ungrab(client, surface);
    tizen_input_device_manager_send_error(resource, ret);
@@ -667,7 +639,6 @@ _e_devicemgr_wl_cb_grab_relative_motion(struct wl_client *client, struct wl_reso
 {
    int ret = TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE;
 
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client,
                                                           E_PRIVILEGE_INTERNAL_DEFAULT_PLATFORM))
      {
@@ -675,7 +646,6 @@ _e_devicemgr_wl_cb_grab_relative_motion(struct wl_client *client, struct wl_reso
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    ret = e_devicemgr_relative_motion_grab(client, resource, surface, boundary);
    tizen_input_device_manager_send_error(resource, ret);
@@ -687,7 +657,6 @@ _e_devicemgr_wl_cb_ungrab_relative_motion(struct wl_client *client, struct wl_re
 {
    int ret = TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE;
 
-#ifdef HAVE_CYNARA
    if (EINA_FALSE == _e_devicemgr_util_do_privilege_check(client,
                                                           E_PRIVILEGE_INTERNAL_DEFAULT_PLATFORM))
      {
@@ -695,7 +664,6 @@ _e_devicemgr_wl_cb_ungrab_relative_motion(struct wl_client *client, struct wl_re
         tizen_input_device_manager_send_error(resource, TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION);
         return;
      }
-#endif
 
    ret = e_devicemgr_relative_motion_ungrab(client, resource, surface);
    tizen_input_device_manager_send_error(resource, ret);

diff --git a/src/bin/server/e_keyrouter_wl.c b/src/bin/server/e_keyrouter_wl.c
index 1ff2c57738b0dc2dd9563c7cc6083914eb57aeb2..ba8b80e4ffa92c191b901a568e1dd2a792dc85ea 100644 (file)
--- a/src/bin/server/e_keyrouter_wl.c
+++ b/src/bin/server/e_keyrouter_wl.c
@@ -633,7 +633,6 @@ e_keyrouter_wl_add_surface_destroy_listener(struct wl_resource *surface)
    return TIZEN_KEYROUTER_ERROR_NONE;
 }
 
-#ifdef HAVE_CYNARA
 EINTERN Eina_Bool
 e_keyrouter_wl_keygrab_privilege_check(struct wl_client *client)
 {
@@ -665,7 +664,6 @@ e_keyrouter_wl_keygrab_privilege_check(struct wl_client *client)
 finish:
    return res;
 }
-#endif
 
 EINTERN E_Tizen_Keyrouter *
 e_keyrouter_wl_init(struct wl_display *display)

diff --git a/src/bin/utils/e_security.c b/src/bin/utils/e_security.c
index 00a9a20fb62c6a948011c6bf1038d71b3bcfabf7..55f9536908727b8601ffd0d05ac152c27b42cf31 100644 (file)
--- a/src/bin/utils/e_security.c
+++ b/src/bin/utils/e_security.c
@@ -1,20 +1,15 @@
 #include "e_security_intern.h"
 
-#ifdef HAVE_CYNARA
 # include <cynara-session.h>
 # include <cynara-client.h>
 # include <cynara-creds-socket.h>
 # include <sys/smack.h>
-#endif
 
-#ifdef HAVE_CYNARA
 static cynara *g_cynara = NULL;
-#endif
 
 E_API Eina_Bool
 e_security_privilege_check(pid_t pid, uid_t uid, const char *privilege)
 {
-#ifdef HAVE_CYNARA
    Eina_Bool res = EINA_FALSE;
 
 #ifdef DISABLE_PRIVILEGE
@@ -65,32 +60,27 @@ finish:
    if (client_smack) E_FREE(client_smack);
 
    return res;
-#else
-   return EINA_TRUE;
-#endif
 }
 
 EINTERN int
 e_security_init(void)
 {
-#ifdef HAVE_CYNARA
    if (cynara_initialize(&g_cynara, NULL) != CYNARA_API_SUCCESS)
      {
         ERR("cynara_initialize failed.");
         g_cynara = NULL;
         return EINA_FALSE;
      }
-#endif
+
    return EINA_TRUE;
 }
 
 EINTERN int
 e_security_shutdown(void)
 {
-#ifdef HAVE_CYNARA
    if (g_cynara)
      cynara_finish(g_cynara);
-#endif
+
    g_cynara = NULL;
 
    return 1;