Fix dbus policy

Change-Id: I5989d3957290f046e566f4b369594a1f41d358b6
Signed-off-by: sooyeon.kim <sooyeon.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2c5819..3522de2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,7 @@ ADD_SUBDIRECTORY(engine-parser)
 ## Config ##
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/tts-config.xml DESTINATION ${TZ_SYS_RO_SHARE}/voice/tts/1.0)
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/tts-server.conf DESTINATION /etc/dbus-1/system.d)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/tts-server.conf DESTINATION /etc/dbus-1/session.d)
 
 ## Dbus service ##
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.ttsserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/services)

diff --git a/packaging/tts.spec b/packaging/tts.spec
index dac64fa..731ddcf 100644 (file)
--- a/packaging/tts.spec
+++ b/packaging/tts.spec
@@ -118,7 +118,7 @@ mkdir -p %{TZ_SYS_RO_SHARE}/voice/test
 %{_bindir}/voice_getengine
 %{TZ_SYS_RO_ETC}/package-manager/parserlib/metadata/libtts-engine-parser.so*
 #%{TZ_SYS_RO_ETC}/package-manager/parserlib/metadata/libtts-engine-language-pack-parser.so*
-/etc/dbus-1/system.d/tts-server.conf
+/etc/dbus-1/session.d/tts-server.conf
 
 %files devel
 %manifest %{name}-devel.manifest

diff --git a/tts-server.conf b/tts-server.conf
index fa770dd..b88e2c4 100644 (file)
--- a/tts-server.conf
+++ b/tts-server.conf
@@ -3,63 +3,21 @@
 <busconfig>
 
 <!-- root can own the service -->
-  <policy user="root">
-    <allow own_prefix="org.tizen.tts"/>
-    <allow send_destination="org.tizen.tts"/>
-    <allow receive_sender="org.tizen.tts"/>
-  </policy>
-
   <policy context="default">
     <allow own_prefix="org.tizen.tts"/>
     <allow send_destination="org.tizen.tts"/>
-    <allow receive_sender="org.tizen.tts"/>
-  </policy>
 
-  
-  <policy user="root">
     <allow own="org.tizen.voice.ttsserver"/>
     <allow send_destination="org.tizen.voice.ttsserver"/>
-    <allow receive_sender="org.tizen.voice.ttsserver"/>
-  </policy>
 
-  <policy context="default">
-    <allow send_destination="org.tizen.voice.ttsserver"
-    send_interface="org.tizen.voice.ttsserver"/>
-  </policy>
-
-  
-  <policy user="root">
     <allow own="org.tizen.voice.ttsnotiserver"/>
     <allow send_destination="org.tizen.voice.ttsnotiserver"/>
-    <allow receive_sender="org.tizen.voice.ttsnotiserver"/>
-  </policy>
 
-  <policy context="default">
-    <allow send_destination="org.tizen.voice.ttsnotiserver"
-    send_interface="org.tizen.voice.ttsnotiserver"/>
-  </policy>
-
-  
-  <policy user="root">
     <allow own="org.tizen.voice.ttssrserver"/>
     <allow send_destination="org.tizen.voice.ttssrserver"/>
-    <allow receive_sender="org.tizen.voice.ttssrserver"/>
-  </policy>
-
-  <policy context="default">
-    <allow send_destination="org.tizen.voice.ttssrserver"
-    send_interface="org.tizen.voice.ttssrserver"/>
-  </policy>
-
 
-  <policy user="root">
     <allow own="org.tizen.voice.ttsinterruptserver"/>
     <allow send_destination="org.tizen.voice.ttsinterruptserver"/>
-    <allow receive_sender="org.tizen.voice.ttsinterruptserver"/>
   </policy>
 
-  <policy context="default">
-    <allow send_destination="org.tizen.voice.ttsinterruptserver"
-    send_interface="org.tizen.voice.ttsinterruptserver"/>
-  </policy>
 </busconfig>