security: Enable cynara to be built

This patch also removes conditional compilation for cynara. This should
be considered again if it gets needed.

Change-Id: I7f7447a0f9a0c51b39bd454180b543f9d2b420e2

diff --git a/packaging/libds.spec b/packaging/libds.spec
index 5258295..ed21c53 100644 (file)
--- a/packaging/libds.spec
+++ b/packaging/libds.spec
@@ -23,6 +23,9 @@ BuildRequires:  pkgconfig(libtbm)
 BuildRequires:  pkgconfig(wayland-tbm-server)
 BuildRequires:  pkgconfig(wayland-tbm-client)
 BuildRequires:  pkgconfig(tizen-dpms-server)
+BuildRequires:  pkgconfig(cynara-client)
+BuildRequires:  pkgconfig(cynara-session)
+BuildRequires:  pkgconfig(libsmack)
 
 %description
 Wayland Compositor Library

diff --git a/src/libds-tizen/util/meson.build b/src/libds-tizen/util/meson.build
index 3d34ab8..0ec6a9d 100644 (file)
--- a/src/libds-tizen/util/meson.build
+++ b/src/libds-tizen/util/meson.build
@@ -1 +1,6 @@
 libds_tizen_files += files('security.c')
+libds_tizen_deps += [
+  dependency('cynara-client', required: true),
+  dependency('cynara-session', required: true),
+  dependency('libsmack', required: true)
+]

diff --git a/src/libds-tizen/util/security.c b/src/libds-tizen/util/security.c
index 9983e24..b592577 100644 (file)
--- a/src/libds-tizen/util/security.c
+++ b/src/libds-tizen/util/security.c
@@ -1,20 +1,17 @@
+#include <stdio.h>
+#include <stdarg.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
 
-#include "libds/log.h"
-
-#include "util.h"
-
-#ifdef HAVE_CYNARA
-#include <stdio.h>
-#include <stdarg.h>
-
 #include <cynara-session.h>
 #include <cynara-client.h>
 #include <cynara-creds-socket.h>
 #include <sys/smack.h>
 
+#include "libds/log.h"
+#include "util.h"
+
 #define CYNARA_BUFSIZE 128
 
 struct ds_cynara
@@ -29,37 +26,25 @@ static bool ds_cynara_init(void);
 static void ds_cynara_finish(void);
 static bool ds_cynara_check_privilege(pid_t pid, uid_t uid,
         const char *privilege);
-#endif
 
 bool
 tizen_security_check_privilege(pid_t pid, uid_t uid, const char *privilege)
 {
-#ifdef HAVE_CYNARA
     return ds_cynara_check_privilege(pid, uid, privilege);
-#else
-    return true;
-#endif
 }
 
 bool
 tizen_security_init(void)
 {
-#ifdef HAVE_CYNARA
     return ds_cynara_init();
-#else
-    return true;
-#endif
 }
 
 void
 tizen_security_finish(void)
 {
-#ifdef HAVE_CYNARA
     ds_cynara_finish();
-#endif
 }
 
-#ifdef HAVE_CYNARA
 static void
 print_cynara_error(int err, const char *fmt, ...)
 {
@@ -178,4 +163,3 @@ finish:
 
     return res;
 }
-#endif