From 06df4f184318164e4d3812d65779eb9e501961ae Mon Sep 17 00:00:00 2001
From: Chengwei Yang <chengwei.yang@intel.com>
Date: Thu, 15 Aug 2013 12:43:11 +0800
Subject: Add dbus policy conf

The default dbus policy config will deny the program to own bus name on
system bus, so every program which want to do that need provide its
policy conf.

Bug: https://bugs.tizen.org/jira/browse/TDIST-268
Change-Id: I054dcd17aeae421a69263cd3209c4fa96790aa87
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
---
 com.samsung.omadmagent.conf    | 10 ++++++++++
 oma-dm-agent.manifest          |  1 +
 packaging/oma-dm-agent.changes |  3 +++
 packaging/oma-dm-agent.spec    |  1 +
 src/agent/CMakeLists.txt       |  1 +
 5 files changed, 16 insertions(+)
 create mode 100644 com.samsung.omadmagent.conf

diff --git a/com.samsung.omadmagent.conf b/com.samsung.omadmagent.conf
new file mode 100644
index 0000000..5e2dd17
--- /dev/null
+++ b/com.samsung.omadmagent.conf
@@ -0,0 +1,10 @@
+<!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="com.samsung.omadmagent"/>
+        </policy>
+        <policy context="default">
+                <allow send_destination="com.samsung.omadmagent"/>
+        </policy>
+</busconfig>
diff --git a/oma-dm-agent.manifest b/oma-dm-agent.manifest
index 9acbc0b..4e81f56 100755
--- a/oma-dm-agent.manifest
+++ b/oma-dm-agent.manifest
@@ -40,6 +40,7 @@
 		<filesystem path="/etc/rc.d/rc5.d/S91oma-dm-agent" label="_" exec_label="none"/>
 		<filesystem path="/etc/init.d/oma-dm" label="_" exec_label="none"/>
 		<filesystem path="/usr/share/dbus-1/system-services/com.samsung.omadmagent.service" label="_"/>
+		<filesystem path="/etc/dbus-1/system.d/com.samsung.omadmagent.service" label="_"/>
 	</assign>
 	<request>
 		<domain name="oma-dm-agent" />
diff --git a/packaging/oma-dm-agent.changes b/packaging/oma-dm-agent.changes
index 333a6ba..7773862 100644
--- a/packaging/oma-dm-agent.changes
+++ b/packaging/oma-dm-agent.changes
@@ -1,3 +1,6 @@
+Tue Aug 13 2013 Chengwei Yang <chengwei.yang@intel.com>
+- Add dbus policy conf
+
 Mon Aug 12 2013 Chengwei Yang <chengwei.yang@intel.com>
 - Install to system-wide dbus service directory, TDIST-295
 
diff --git a/packaging/oma-dm-agent.spec b/packaging/oma-dm-agent.spec
index eeb4592..ba16da5 100755
--- a/packaging/oma-dm-agent.spec
+++ b/packaging/oma-dm-agent.spec
@@ -135,6 +135,7 @@ rm -rf /usr/share/oma-dm-cfg
 %manifest oma-dm-agent.manifest
 %defattr(-,root,root,-)
 /usr/share/dbus-1/system-services/com.samsung.omadmagent.service
+/etc/dbus-1/system.d/com.samsung.omadmagent.conf
 /usr/bin/oma-dm-agent
 
 /usr/share/oma-dm-cfg/ddf/*
diff --git a/src/agent/CMakeLists.txt b/src/agent/CMakeLists.txt
index 4879927..44d480f 100755
--- a/src/agent/CMakeLists.txt
+++ b/src/agent/CMakeLists.txt
@@ -79,6 +79,7 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/oma-dm-cfg DESTINATION /usr/share)
 
 # install oma ds dbus file
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.omadmagent.service DESTINATION /usr/share/dbus-1/system-services)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.omadmagent.conf DESTINATION /etc/dbus-1/system.d)
 
 # install booting script file
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/${PROJECT_NAME} DESTINATION /etc/init.d/)
-- 
cgit v1.2.3