From a93a56e08f57ee03f3cbddf61223d7a06cf4610e Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 23 Jan 2007 07:34:33 +0000
Subject: Move bluetooth.conf D-Bus security file into daemon directory

---
 daemon/Makefile.am    |  6 ++++++
 daemon/bluetooth.conf | 33 +++++++++++++++++++++++++++++++++
 hcid/Makefile.am      |  6 +-----
 hcid/bluetooth.conf   | 33 ---------------------------------
 4 files changed, 40 insertions(+), 38 deletions(-)
 create mode 100644 daemon/bluetooth.conf
 delete mode 100644 hcid/bluetooth.conf

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index f9474a8d..e7133f43 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -17,6 +17,12 @@ bluetoothd_service_echo_LDADD = \
 	@GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
 endif
 
+if CONFIGFILES
+dbusdir = $(sysconfdir)/dbus-1/system.d
+
+dbus_DATA = bluetooth.conf
+endif
+
 noinst_PROGRAMS = bluetoothd
 
 bluetoothd_SOURCES = main.c system.h \
diff --git a/daemon/bluetooth.conf b/daemon/bluetooth.conf
new file mode 100644
index 00000000..aa642a2a
--- /dev/null
+++ b/daemon/bluetooth.conf
@@ -0,0 +1,33 @@
+<!-- This configuration file specifies the required security policies
+     for Bluetooth core service 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 user="root">
+    <allow own="org.bluez"/>
+  </policy>
+
+  <policy at_console="true">
+    <allow send_destination="org.bluez.Manager"/>
+    <allow receive_sender="org.bluez.Manager"/>
+
+    <allow send_path="/org/bluez"/>
+
+    <allow send_destination="org.bluez.Adapter"/>
+    <allow receive_sender="org.bluez.Adapter"/>
+
+    <allow send_destination="org.bluez.Service"/>
+    <allow receive_sender="org.bluez.Service"/>
+
+    <allow send_destination="org.bluez.Database"/>
+    <allow receive_sender="org.bluez.Database"/>
+
+    <allow send_destination="org.bluez.Security"/>
+    <allow receive_sender="org.bluez.Security"/>
+  </policy>
+
+</busconfig>
diff --git a/hcid/Makefile.am b/hcid/Makefile.am
index 4656412b..973960b5 100644
--- a/hcid/Makefile.am
+++ b/hcid/Makefile.am
@@ -7,10 +7,6 @@ conf_DATA = hcid.conf
 statedir = $(localstatedir)/lib/bluetooth
 
 state_DATA =
-
-dbusdir = $(sysconfdir)/dbus-1/system.d
-
-dbus_DATA = bluetooth.conf
 endif
 
 noinst_LIBRARIES = libhciserver.a
@@ -61,7 +57,7 @@ AM_YFLAGS = -d
 
 CLEANFILES = lexer.c parser.c parser.h
 
-EXTRA_DIST = $(man_MANS) hcid.conf bluetooth.conf dbus-api.txt \
+EXTRA_DIST = $(man_MANS) hcid.conf dbus-api.txt \
 	service-record.dtd service-did.xml service-spp.xml \
 	service-opp.xml service-ftp.xml
 
diff --git a/hcid/bluetooth.conf b/hcid/bluetooth.conf
deleted file mode 100644
index aa642a2a..00000000
--- a/hcid/bluetooth.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- This configuration file specifies the required security policies
-     for Bluetooth core service 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 user="root">
-    <allow own="org.bluez"/>
-  </policy>
-
-  <policy at_console="true">
-    <allow send_destination="org.bluez.Manager"/>
-    <allow receive_sender="org.bluez.Manager"/>
-
-    <allow send_path="/org/bluez"/>
-
-    <allow send_destination="org.bluez.Adapter"/>
-    <allow receive_sender="org.bluez.Adapter"/>
-
-    <allow send_destination="org.bluez.Service"/>
-    <allow receive_sender="org.bluez.Service"/>
-
-    <allow send_destination="org.bluez.Database"/>
-    <allow receive_sender="org.bluez.Database"/>
-
-    <allow send_destination="org.bluez.Security"/>
-    <allow receive_sender="org.bluez.Security"/>
-  </policy>
-
-</busconfig>
-- 
cgit