Fix .service and install it into dbus system service directory

In Tizen 3.0, dbus will running with an unprivileged user 'dbus' and use
an setuid servicehelper to activate system service, which should be
installed into the system-service directory if it provides system wide
service, and "User=" field is must to have to servicehelper.

Bug: https://bugs.tizen.org/jira/browse/PTREL-124
Change-Id: Iaa0c1107a79f5a253c7e75866b19a8b2d32c4bd8
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>

diff --git a/packaging/wrt-security.spec b/packaging/wrt-security.spec
index ff36036..f0619b5 100644 (file)
--- a/packaging/wrt-security.spec
+++ b/packaging/wrt-security.spec
@@ -121,7 +121,7 @@ echo "[WRT] wrt-security postinst done ..."
 /usr/share/wrt-engine/*
 %attr(755,root,root) %{_bindir}/wrt_security_create_clean_db.sh
 %attr(755,root,root) %{_bindir}/wrt_security_change_policy.sh
-%attr(664,root,root) %{_datadir}/dbus-1/services/*
+%attr(664,root,root) %{_datadir}/dbus-1/system-services/*
 %attr(664,root,root) /usr/etc/ace/bondixml*
 %attr(664,root,root) /usr/etc/ace/UnrestrictedPolicy.xml
 %attr(664,root,root) /usr/etc/ace/WAC2.0Policy.xml

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9aa2075..4286298 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -115,7 +115,7 @@ INSTALL(TARGETS ${TARGET_DAEMON}
 
 INSTALL(FILES
     ${PROJECT_SOURCE_DIR}/src/daemon/dbus/org.tizen.SecurityDaemon.service
-    DESTINATION /usr/share/dbus-1/services
+    DESTINATION /usr/share/dbus-1/system-services
     )
 
 INSTALL(FILES

diff --git a/src/daemon/dbus/org.tizen.SecurityDaemon.service b/src/daemon/dbus/org.tizen.SecurityDaemon.service
index fc51772..ed3897f 100644 (file)
--- a/src/daemon/dbus/org.tizen.SecurityDaemon.service
+++ b/src/daemon/dbus/org.tizen.SecurityDaemon.service
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.tizen.SecurityDaemon
 Exec=/usr/bin/wrt-security-daemon
+User=root