Do not use USE_SECURITY in libpulse header

[Version] 5.0-72
[Profile] Common
[Issue Type] Fix error

Change-Id: I4aaab37fa13a46bcb1c60e00f23c9e8c35a6f68b

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index b2d4a3d..50d4506 100644 (file)
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -10,7 +10,7 @@
 Name:             pulseaudio
 Summary:          Improved Linux sound server
 Version:          5.0
-Release:          71
+Release:          72
 Group:            Multimedia/Audio
 License:          LGPL-2.1+
 URL:              http://pulseaudio.org

diff --git a/src/pulse/context.c b/src/pulse/context.c
index 1064fc9..c7cdb33 100644 (file)
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -1192,7 +1192,7 @@ pa_operation* pa_context_set_default_source(pa_context *c, const char *name, pa_
     return o;
 }
 
-#ifdef USE_SECURITY
+#ifdef __TIZEN__
 pa_operation* pa_context_check_privilege(pa_context *c, const char *privilege, pa_context_success_cb_t cb, void *userdata) {
     pa_tagstruct *t;
     pa_operation *o;

diff --git a/src/pulse/context.h b/src/pulse/context.h
index e51c07b..59090f0 100644 (file)
--- a/src/pulse/context.h
+++ b/src/pulse/context.h
@@ -288,7 +288,7 @@ size_t pa_context_get_tile_size(pa_context *c, const pa_sample_spec *ss);
  * location, feel free to use this function. \since 5.0 */
 int pa_context_load_cookie_from_file(pa_context *c, const char *cookie_file_path);
 
-#ifdef USE_SECURITY
+#ifdef __TIZEN__
 pa_operation* pa_context_check_privilege(pa_context *c, const char *privilege, pa_context_success_cb_t cb, void *userdata);
 #endif
 

diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index ac2b6b0..9b3e6ba 100644 (file)
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -412,7 +412,7 @@ static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
 
     [PA_COMMAND_SET_SINK_VOLUME_RAMP] = command_set_volume_ramp,
     [PA_COMMAND_SET_SINK_INPUT_VOLUME_RAMP] = command_set_volume_ramp,
-#ifdef USE_SECURITY
+#ifdef __TIZEN__
     [PA_COMMAND_CHECK_PRIVILEGE] = command_check_privilege,
 #endif
 
@@ -2414,7 +2414,7 @@ static void command_delete_stream(pa_pdispatch *pd, uint32_t command, uint32_t t
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
-#ifdef USE_SECURITY
+#ifdef __TIZEN__
 static void command_check_privilege(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     pa_native_connection *c = PA_NATIVE_CONNECTION(userdata);
     const char *privilege;
@@ -2427,7 +2427,11 @@ static void command_check_privilege(pa_pdispatch *pd, uint32_t command, uint32_t
         return;
     }
 
+#ifdef USE_SECURITY
     CHECK_VALIDITY(c->pstream, cynara_check_privilege(_get_connection_out_fd(c), privilege), tag, PA_ERR_ACCESS);
+#else
+    pa_log_warn("Cannot check privilege %s", privilege);
+#endif
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 #endif