From 66605acd2f237c337169ea975b399784ffa76788 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sun, 9 Oct 2005 23:31:29 +0000
Subject: Install D-Bus security configuration

---
 hcid/Makefile.am     |  4 +++-
 hcid/bluez-hcid.conf | 24 ++++++++++++++++++++++++
 hcid/dbus.conf       | 24 ------------------------
 3 files changed, 27 insertions(+), 25 deletions(-)
 create mode 100644 hcid/bluez-hcid.conf
 delete mode 100644 hcid/dbus.conf

diff --git a/hcid/Makefile.am b/hcid/Makefile.am
index b20432f3..b616cbfc 100644
--- a/hcid/Makefile.am
+++ b/hcid/Makefile.am
@@ -12,6 +12,8 @@ state_DATA =
 
 if DBUS
 dbusdir = $(sysconfdir)/dbus-1/system.d
+
+dbus_DATA = bluez-hcid.conf
 endif
 
 sbin_PROGRAMS = hcid
@@ -39,7 +41,7 @@ AM_YFLAGS = -d
 
 CLEANFILES = lexer.c parser.c parser.h
 
-EXTRA_DIST = $(man_MANS) $(conf_DATA) dbus.h dbus.c dbus.conf
+EXTRA_DIST = $(man_MANS) $(conf_DATA) dbus.h dbus.c bluez-hcid.conf
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/hcid/bluez-hcid.conf b/hcid/bluez-hcid.conf
new file mode 100644
index 00000000..af3c49e7
--- /dev/null
+++ b/hcid/bluez-hcid.conf
@@ -0,0 +1,24 @@
+<!-- This configuration file specifies the required security policies
+     for BlueZ hcid to work. -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- ../system.conf have denied everything, so we just punch some holes -->
+
+  <policy context="default">
+    <allow own="org.bluez"/>
+
+    <allow send_destination="org.bluez.Device"/>
+    <allow receive_sender="org.bluez.Device"/>
+
+    <allow send_path="/org/bluez/Device"/>
+
+    <allow send_destination="org.bluez.Manager"/>
+    <allow receive_sender="org.bluez.Manager"/>
+
+    <allow send_path="/org/bluez/Manager"/>
+  </policy>
+
+</busconfig>
diff --git a/hcid/dbus.conf b/hcid/dbus.conf
deleted file mode 100644
index af3c49e7..00000000
--- a/hcid/dbus.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- This configuration file specifies the required security policies
-     for BlueZ hcid to work. -->
-
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <!-- ../system.conf have denied everything, so we just punch some holes -->
-
-  <policy context="default">
-    <allow own="org.bluez"/>
-
-    <allow send_destination="org.bluez.Device"/>
-    <allow receive_sender="org.bluez.Device"/>
-
-    <allow send_path="/org/bluez/Device"/>
-
-    <allow send_destination="org.bluez.Manager"/>
-    <allow receive_sender="org.bluez.Manager"/>
-
-    <allow send_path="/org/bluez/Manager"/>
-  </policy>
-
-</busconfig>
-- 
cgit