Remove PA_ERR_ACCESS_BY_SECURITY added by Tizen rather use PA_ERR_ACCESS

[Version] 5.0-66
[Profile] Common
[Issue Type] CleanUp

Change-Id: I047272046953bff79b3c0593ae136eb50b9ce39f

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index b1121ae..189b496 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:          65
+Release:          66
 Group:            Multimedia/Audio
 License:          LGPL-2.1+
 URL:              http://pulseaudio.org

diff --git a/src/pulse/def.h b/src/pulse/def.h
index 2c2c6bc..b7854a3 100644 (file)
--- a/src/pulse/def.h
+++ b/src/pulse/def.h
@@ -487,9 +487,6 @@ typedef enum pa_error_code {
     PA_ERR_FORKED,                 /**< The caller forked without calling execve() and tried to reuse the context. \since 0.9.15 */
     PA_ERR_IO,                     /**< An IO error happened. \since 0.9.16 */
     PA_ERR_BUSY,                   /**< Device or resource busy. \since 0.9.17 */
-#ifdef __TIZEN__
-    PA_ERR_ACCESS_BY_SECURITY,     /**< Access failure by security */
-#endif
     PA_ERR_MAX                     /**< Not really an error but the first invalid error code */
 } pa_error_code_t;
 
@@ -519,9 +516,6 @@ typedef enum pa_error_code {
 #define PA_ERR_OBSOLETE PA_ERR_OBSOLETE
 #define PA_ERR_NOTIMPLEMENTED PA_ERR_NOTIMPLEMENTED
 #define PA_ERR_FORKED PA_ERR_FORKED
-#ifdef __TIZEN__
-#define PA_ERR_ACCESS_BY_SECURITY PA_ERR_ACCESS_BY_SECURITY
-#endif
 #define PA_ERR_MAX PA_ERR_MAX
 /** \endcond */
 

diff --git a/src/pulse/error.c b/src/pulse/error.c
index 2ca6309..751d42a 100644 (file)
--- a/src/pulse/error.c
+++ b/src/pulse/error.c
@@ -64,9 +64,6 @@ const char*pa_strerror(int error) {
         [PA_ERR_FORKED] = N_("Client forked"),
         [PA_ERR_IO] = N_("Input/Output error"),
         [PA_ERR_BUSY] = N_("Device or resource busy")
-#ifdef __TIZEN__
-        ,[PA_ERR_ACCESS_BY_SECURITY] = N_("Access denied by security check")
-#endif
     };
 
     pa_init_i18n();

diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index a736897..53ef6a1 100644 (file)
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -2481,7 +2481,7 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin
     pa_log_info("is virtual stream : %s", pa_yes_no(is_virtual_stream));
     if (!is_virtual_stream) {
         CHECK_VALIDITY(c->pstream, cynara_check_privilege(_get_connection_out_fd(c), RECORDER_PRIVILEGE),
-                       tag, PA_ERR_ACCESS_BY_SECURITY);
+                       tag, PA_ERR_ACCESS);
     }
 #endif /* USE_SECURITY */
 
@@ -3866,7 +3866,7 @@ static void command_set_volume(
 
 #ifdef USE_SECURITY
     CHECK_VALIDITY(c->pstream, cynara_check_privilege(_get_connection_out_fd(c), VOLUME_SET_PRIVILEGE),
-                   tag, PA_ERR_ACCESS_BY_SECURITY);
+                   tag, PA_ERR_ACCESS);
 #endif /* USE_SECURITY */
 
     switch (command) {
@@ -3966,7 +3966,7 @@ static void command_set_volume_ramp(
     CHECK_VALIDITY(c->pstream, !name || idx == PA_INVALID_INDEX, tag, PA_ERR_INVALID);
 #ifdef USE_SECURITY
     CHECK_VALIDITY(c->pstream, cynara_check_privilege(_get_connection_out_fd(c), VOLUME_SET_PRIVILEGE),
-                   tag, PA_ERR_ACCESS_BY_SECURITY);
+                   tag, PA_ERR_ACCESS);
 #endif /* USE_SECURITY */
 
     switch (command) {
@@ -4034,7 +4034,7 @@ static void command_set_mute(
     CHECK_VALIDITY(c->pstream, (idx != PA_INVALID_INDEX) ^ (name != NULL), tag, PA_ERR_INVALID);
 #ifdef USE_SECURITY
     CHECK_VALIDITY(c->pstream, cynara_check_privilege(_get_connection_out_fd(c), VOLUME_SET_PRIVILEGE),
-                   tag, PA_ERR_ACCESS_BY_SECURITY);
+                   tag, PA_ERR_ACCESS);
 #endif /* USE_SECURITY */
 
     switch (command) {