Add multi-user support

Bug-Tizen: PTREL-285
Change-Id: I29a51a6e1b2ecb6293fd444e3b8eee44a5c1b0ee
Signed-off-by: shivajm <shiva.jm@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 875850cacbb0de0cc2f2476cec5e0940054c52e7..b818e877c3708bd19abe8052506756c1dc1d94d2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(CMAKE_INSTALL_PREFIX "${PREFIX}")
 
 # Set required packages
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 tcore dlog aul appsvc security-server)
+pkg_check_modules(pkgs REQUIRED glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 tcore dlog aul appsvc security-server libtzplatform-config)
 
 FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
@@ -58,6 +58,7 @@ TARGET_LINK_LIBRARIES(dbus-tapi-plugin ${pkgs_LDFLAGS})
 SET_TARGET_PROPERTIES(dbus-tapi-plugin PROPERTIES PREFIX "" OUTPUT_NAME dbus-tapi-plugin)
 ADD_DEPENDENCIES(dbus-tapi-plugin XXX)
 
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/res/tapi.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/res/tapi.conf)
 
 # install
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/tapi.conf DESTINATION ${PREFIX}/etc/dbus-1/system.d)

diff --git a/packaging/tel-plugin-dbus_tapi.spec b/packaging/tel-plugin-dbus_tapi.spec
index fbed7af69aa7bb02b5809a0671b036dc5353f1d6..b39731e5b2b5f3acf7c0fda10376656e4ba25d43 100644 (file)
--- a/packaging/tel-plugin-dbus_tapi.spec
+++ b/packaging/tel-plugin-dbus_tapi.spec
@@ -23,6 +23,7 @@ BuildRequires:  pkgconfig(appsvc)
 BuildRequires:  pkgconfig(security-server)
 BuildRequires:  python
 BuildRequires:  python-xml
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description
 dbus-tapi plugin for telephony
@@ -36,6 +37,9 @@ versionint=$[%{major} * 1000000 + %{minor} * 1000 + %{patchlevel}]
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DVERSION=$versionint
 make %{?jobs:-j%jobs}
 
+%cmake . \
+-DTZ_SYS_USER_GROUP=%TZ_SYS_USER_GROUP
+
 %post
 /sbin/ldconfig
 

diff --git a/res/tapi.conf b/res/tapi.conf
deleted file mode 100644 (file)
index 943e73d..0000000
--- a/res/tapi.conf
+++ /dev/null
@@ -1,20 +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.telephony"/>
-        <allow send_destination="org.tizen.telephony"/>
-        <allow send_interface="org.tizen.telephony"/>
-    </policy>
-    <policy user="app">
-        <allow own="org.tizen.telephony"/>
-        <allow send_destination="org.tizen.telephony"/>
-        <allow send_interface="org.tizen.telephony"/>
-    </policy>
-    <policy at_console="true">
-        <allow send_destination="org.tizen.telephony"/>
-    </policy>
-    <policy context="default">
-        <deny send_destination="org.tizen.telephony"/>
-    </policy>
-</busconfig>

diff --git a/res/tapi.conf.in b/res/tapi.conf.in
new file mode 100644 (file)
index 0000000..f8a43a1
--- /dev/null
+++ b/res/tapi.conf.in
@@ -0,0 +1,20 @@
+<!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.telephony"/>
+        <allow send_destination="org.tizen.telephony"/>
+        <allow send_interface="org.tizen.telephony"/>
+    </policy>
+    <policy group="@TZ_SYS_USER_GROUP@">
+        <allow own="org.tizen.telephony"/>
+        <allow send_destination="org.tizen.telephony"/>
+        <allow send_interface="org.tizen.telephony"/>
+    </policy>
+    <policy at_console="true">
+        <allow send_destination="org.tizen.telephony"/>
+    </policy>
+    <policy context="default">
+        <deny send_destination="org.tizen.telephony"/>
+    </policy>
+</busconfig>