Remove hardcoded path for multiuser support

Bug-Tizen: PTREL-392

Change-Id: I48db83c1685c897c3154cf8c8201a76c08998ef2
Signed-off-by: Sabera Djelti (sdi2) <sabera.djelti@open.eurogiciel.org>

diff --git a/packaging/lbs-dbus.spec b/packaging/lbs-dbus.spec
index 84a850948c887fce4a0f3f1e4a1f623acac7a518..92a760bfb3f50d55e5fa79cbb048c14e486a393a 100644 (file)
--- a/packaging/lbs-dbus.spec
+++ b/packaging/lbs-dbus.spec
@@ -14,6 +14,7 @@ BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  python
 BuildRequires:  python-xml
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description
 LBS dbus interface
@@ -38,10 +39,9 @@ LBS client API library (devel)
 %setup -q
 cp %{SOURCE1001} .
 
-
 %build
-%cmake . 
-
+%cmake . \
+-DTZ_SYS_USER_GROUP=%TZ_SYS_USER_GROUP
 
 make %{?jobs:-j%jobs}
 

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index e742568c880ad368d88a0627ecf0626799899c4b..283d2b336761e14f426b3d97bfc97654d3a2fc4a 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -22,6 +22,8 @@ ADD_LIBRARY(lbs-dbus-server SHARED ${SRCS_S})
 TARGET_LINK_LIBRARIES(lbs-dbus-server ${pkgs_LDFLAGS})
 SET_TARGET_PROPERTIES(lbs-dbus-server PROPERTIES VERSION 0.1.0 SOVERSION 0 OUTPUT_NAME lbs-dbus-server)
 
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/res/lbs-dbus-server.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/res/lbs-dbus-server.conf)
+
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/lbs-dbus-server.conf DESTINATION ${SYSCONFDIR}/dbus-1/system.d)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/lbs_dbus_server.h DESTINATION include/lbs-dbus)
 INSTALL(TARGETS lbs-dbus-server DESTINATION ${LIB_INSTALL_DIR} COMPONENT Runtime)

diff --git a/server/res/lbs-dbus-server.conf b/server/res/lbs-dbus-server.conf
deleted file mode 100644 (file)
index 83f6ff1..0000000
--- a/server/res/lbs-dbus-server.conf
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-    <policy user="root">
-        <allow own="org.tizen.lbs"/>
-               <allow own="org.tizen.lbs.Manager"/>
-               <allow own="org.tizen.lbs.Providers.GpsManager"/>
-               <allow own="org.tizen.lbs.Providers.Xps"/>
-               <allow send_destination="org.tizen.lbs"/>
-               <allow send_destination="org.tizen.lbs.Manager"/>
-               <allow send_destination="org.tizen.lbs.Providers.GpsManager"/>
-               <allow send_destination="org.tizen.lbs.Providers.Xps"/>
-               <allow receive_sender="org.tizen.lbs.Manager"/>
-               <allow receive_sender="org.tizen.lbs.Providers.GpsManager"/>
-               <allow receive_sender="org.tizen.lbs.Providers.Xps"/>
-               <allow send_interface="org.tizen.lbs"/>
-               <allow send_interface="org.tizen.lbs.Manager"/>
-               <allow send_interface="org.tizen.lbs.Position"/>
-               <allow send_interface="org.tizen.lbs.Nmea"/>
-               <allow send_interface="org.tizen.lbs.Satellite"/>
-               <allow receive_interface="org.tizen.lbs"/>
-               <allow receive_interface="org.tizen.lbs.Manager"/>
-               <allow receive_interface="org.tizen.lbs.Position"/>
-               <allow receive_interface="org.tizen.lbs.Nmea"/>
-               <allow receive_interface="org.tizen.lbs.Satellite"/>
-    </policy>
-    <policy user="app">
-        <allow own="org.tizen.lbs"/>
-               <allow own="org.tizen.lbs.Manager"/>
-               <allow own="org.tizen.lbs.Providers.GpsManager"/>
-               <allow own="org.tizen.lbs.Providers.Xps"/>
-               <allow send_destination="org.tizen.lbs"/>
-               <allow send_destination="org.tizen.lbs.Manager"/>
-               <allow send_destination="org.tizen.lbs.Providers.GpsManager"/>
-               <allow send_destination="org.tizen.lbs.Providers.Xps"/>
-               <allow receive_sender="org.tizen.lbs.Manager"/>
-               <allow receive_sender="org.tizen.lbs.Providers.GpsManager"/>
-               <allow receive_sender="org.tizen.lbs.Providers.Xps"/>
-               <allow send_interface="org.tizen.lbs"/>
-               <allow send_interface="org.tizen.lbs.Manager"/>
-               <allow send_interface="org.tizen.lbs.Poistion"/>
-               <allow send_interface="org.tizen.lbs.Nmea"/>
-               <allow send_interface="org.tizen.lbs.Satellite"/>
-               <allow receive_interface="org.tizen.lbs"/>
-               <allow receive_interface="org.tizen.lbs.Manager"/>
-               <allow receive_interface="org.tizen.lbs.Position"/>
-               <allow receive_interface="org.tizen.lbs.Nmea"/>
-               <allow receive_interface="org.tizen.lbs.Satellite"/>
-    </policy>
-    <policy at_console="true">
-        <allow own="org.tizen.lbs"/>
-               <allow own="org.tizen.lbs.Manager"/>
-               <allow own="org.tizen.lbs.Providers.GpsManager"/>
-               <allow own="org.tizen.lbs.Providers.Xps"/>
-               <allow send_destination="org.tizen.lbs"/>
-               <allow send_destination="org.tizen.lbs.Manager"/>
-               <allow send_destination="org.tizen.lbs.Providers.GpsManager"/>
-               <allow send_destination="org.tizen.lbs.Providers.Xps"/>
-               <allow receive_sender="org.tizen.lbs.Manager"/>
-               <allow receive_sender="org.tizen.lbs.Providers.GpsManager"/>
-               <allow receive_sender="org.tizen.lbs.Providers.Xps"/>
-               <allow send_interface="org.tizen.lbs"/>
-               <allow send_interface="org.tizen.lbs.Manager"/>
-               <allow send_interface="org.tizen.lbs.Poistion"/>
-               <allow send_interface="org.tizen.lbs.Nmea"/>
-               <allow send_interface="org.tizen.lbs.Satellite"/>
-               <allow receive_interface="org.tizen.lbs"/>
-               <allow receive_interface="org.tizen.lbs.Manager"/>
-               <allow receive_interface="org.tizen.lbs.Position"/>
-               <allow receive_interface="org.tizen.lbs.Nmea"/>
-               <allow receive_interface="org.tizen.lbs.Satellite"/>
-    </policy>
-    <policy context="default">
-        <deny own="org.tizen.lbs"/>
-               <deny own="org.tizen.lbs.Manager"/>
-               <deny own="org.tizen.lbs.Providers.GpsManager"/>
-               <deny own="org.tizen.lbs.Providers.Xps"/>
-               <deny send_destination="org.tizen.lbs"/>
-               <deny send_destination="org.tizen.lbs.Manager"/>
-               <deny send_destination="org.tizen.lbs.Providers.GpsManager"/>
-               <deny send_destination="org.tizen.lbs.Providers.Xps"/>
-               <deny receive_sender="org.tizen.lbs.Manager"/>
-               <deny receive_sender="org.tizen.lbs.Providers.GpsManager"/>
-               <deny receive_sender="org.tizen.lbs.Providers.Xps"/>
-               <deny send_interface="org.tizen.lbs"/>
-               <deny send_interface="org.tizen.lbs.Manager"/>
-               <deny send_interface="org.tizen.lbs.Poistion"/>
-               <deny send_interface="org.tizen.lbs.Nmea"/>
-               <deny send_interface="org.tizen.lbs.Satellite"/>
-               <deny receive_interface="org.tizen.lbs"/>
-               <deny receive_interface="org.tizen.lbs.Manager"/>
-               <deny receive_interface="org.tizen.lbs.Position"/>
-               <deny receive_interface="org.tizen.lbs.Nmea"/>
-               <deny receive_interface="org.tizen.lbs.Satellite"/>
-    </policy>
-</busconfig>

diff --git a/server/res/lbs-dbus-server.conf.in b/server/res/lbs-dbus-server.conf.in
new file mode 100644 (file)
index 0000000..a9c5323
--- /dev/null
+++ b/server/res/lbs-dbus-server.conf.in
@@ -0,0 +1,96 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+    <policy user="root">
+        <allow own="org.tizen.lbs"/>
+               <allow own="org.tizen.lbs.Manager"/>
+               <allow own="org.tizen.lbs.Providers.GpsManager"/>
+               <allow own="org.tizen.lbs.Providers.Xps"/>
+               <allow send_destination="org.tizen.lbs"/>
+               <allow send_destination="org.tizen.lbs.Manager"/>
+               <allow send_destination="org.tizen.lbs.Providers.GpsManager"/>
+               <allow send_destination="org.tizen.lbs.Providers.Xps"/>
+               <allow receive_sender="org.tizen.lbs.Manager"/>
+               <allow receive_sender="org.tizen.lbs.Providers.GpsManager"/>
+               <allow receive_sender="org.tizen.lbs.Providers.Xps"/>
+               <allow send_interface="org.tizen.lbs"/>
+               <allow send_interface="org.tizen.lbs.Manager"/>
+               <allow send_interface="org.tizen.lbs.Position"/>
+               <allow send_interface="org.tizen.lbs.Nmea"/>
+               <allow send_interface="org.tizen.lbs.Satellite"/>
+               <allow receive_interface="org.tizen.lbs"/>
+               <allow receive_interface="org.tizen.lbs.Manager"/>
+               <allow receive_interface="org.tizen.lbs.Position"/>
+               <allow receive_interface="org.tizen.lbs.Nmea"/>
+               <allow receive_interface="org.tizen.lbs.Satellite"/>
+    </policy>
+    <policy group="@TZ_SYS_USER_GROUP@">
+        <allow own="org.tizen.lbs"/>
+               <allow own="org.tizen.lbs.Manager"/>
+               <allow own="org.tizen.lbs.Providers.GpsManager"/>
+               <allow own="org.tizen.lbs.Providers.Xps"/>
+               <allow send_destination="org.tizen.lbs"/>
+               <allow send_destination="org.tizen.lbs.Manager"/>
+               <allow send_destination="org.tizen.lbs.Providers.GpsManager"/>
+               <allow send_destination="org.tizen.lbs.Providers.Xps"/>
+               <allow receive_sender="org.tizen.lbs.Manager"/>
+               <allow receive_sender="org.tizen.lbs.Providers.GpsManager"/>
+               <allow receive_sender="org.tizen.lbs.Providers.Xps"/>
+               <allow send_interface="org.tizen.lbs"/>
+               <allow send_interface="org.tizen.lbs.Manager"/>
+               <allow send_interface="org.tizen.lbs.Poistion"/>
+               <allow send_interface="org.tizen.lbs.Nmea"/>
+               <allow send_interface="org.tizen.lbs.Satellite"/>
+               <allow receive_interface="org.tizen.lbs"/>
+               <allow receive_interface="org.tizen.lbs.Manager"/>
+               <allow receive_interface="org.tizen.lbs.Position"/>
+               <allow receive_interface="org.tizen.lbs.Nmea"/>
+               <allow receive_interface="org.tizen.lbs.Satellite"/>
+    </policy>
+    <policy at_console="true">
+        <allow own="org.tizen.lbs"/>
+               <allow own="org.tizen.lbs.Manager"/>
+               <allow own="org.tizen.lbs.Providers.GpsManager"/>
+               <allow own="org.tizen.lbs.Providers.Xps"/>
+               <allow send_destination="org.tizen.lbs"/>
+               <allow send_destination="org.tizen.lbs.Manager"/>
+               <allow send_destination="org.tizen.lbs.Providers.GpsManager"/>
+               <allow send_destination="org.tizen.lbs.Providers.Xps"/>
+               <allow receive_sender="org.tizen.lbs.Manager"/>
+               <allow receive_sender="org.tizen.lbs.Providers.GpsManager"/>
+               <allow receive_sender="org.tizen.lbs.Providers.Xps"/>
+               <allow send_interface="org.tizen.lbs"/>
+               <allow send_interface="org.tizen.lbs.Manager"/>
+               <allow send_interface="org.tizen.lbs.Poistion"/>
+               <allow send_interface="org.tizen.lbs.Nmea"/>
+               <allow send_interface="org.tizen.lbs.Satellite"/>
+               <allow receive_interface="org.tizen.lbs"/>
+               <allow receive_interface="org.tizen.lbs.Manager"/>
+               <allow receive_interface="org.tizen.lbs.Position"/>
+               <allow receive_interface="org.tizen.lbs.Nmea"/>
+               <allow receive_interface="org.tizen.lbs.Satellite"/>
+    </policy>
+    <policy context="default">
+        <deny own="org.tizen.lbs"/>
+               <deny own="org.tizen.lbs.Manager"/>
+               <deny own="org.tizen.lbs.Providers.GpsManager"/>
+               <deny own="org.tizen.lbs.Providers.Xps"/>
+               <deny send_destination="org.tizen.lbs"/>
+               <deny send_destination="org.tizen.lbs.Manager"/>
+               <deny send_destination="org.tizen.lbs.Providers.GpsManager"/>
+               <deny send_destination="org.tizen.lbs.Providers.Xps"/>
+               <deny receive_sender="org.tizen.lbs.Manager"/>
+               <deny receive_sender="org.tizen.lbs.Providers.GpsManager"/>
+               <deny receive_sender="org.tizen.lbs.Providers.Xps"/>
+               <deny send_interface="org.tizen.lbs"/>
+               <deny send_interface="org.tizen.lbs.Manager"/>
+               <deny send_interface="org.tizen.lbs.Poistion"/>
+               <deny send_interface="org.tizen.lbs.Nmea"/>
+               <deny send_interface="org.tizen.lbs.Satellite"/>
+               <deny receive_interface="org.tizen.lbs"/>
+               <deny receive_interface="org.tizen.lbs.Manager"/>
+               <deny receive_interface="org.tizen.lbs.Position"/>
+               <deny receive_interface="org.tizen.lbs.Nmea"/>
+               <deny receive_interface="org.tizen.lbs.Satellite"/>
+    </policy>
+</busconfig>