From 88567b4d7664a705723766ce0333c28173fe6cfe Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 13 Nov 2006 16:23:36 +0000
Subject: Rename bluez-hcid.conf to bluetooth.conf

---
 hcid/Makefile.am     |  4 ++--
 hcid/bluetooth.conf  | 30 ++++++++++++++++++++++++++++++
 hcid/bluez-hcid.conf | 30 ------------------------------
 3 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100644 hcid/bluetooth.conf
 delete mode 100644 hcid/bluez-hcid.conf

(limited to 'hcid')

diff --git a/hcid/Makefile.am b/hcid/Makefile.am
index 560238c0..4a4f5b42 100644
--- a/hcid/Makefile.am
+++ b/hcid/Makefile.am
@@ -10,7 +10,7 @@ state_DATA =
 
 dbusdir = $(sysconfdir)/dbus-1/system.d
 
-dbus_DATA = bluez-hcid.conf
+dbus_DATA = bluetooth.conf
 endif
 
 sbin_PROGRAMS = hcid
@@ -51,7 +51,7 @@ AM_YFLAGS = -d
 
 CLEANFILES = lexer.c parser.c parser.h
 
-EXTRA_DIST = $(man_MANS) hcid.conf bluez-hcid.conf \
+EXTRA_DIST = $(man_MANS) hcid.conf bluetooth.conf \
 	service-record.dtd service-opp.xml dbus-api.txt
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/hcid/bluetooth.conf b/hcid/bluetooth.conf
new file mode 100644
index 00000000..94a1d74a
--- /dev/null
+++ b/hcid/bluetooth.conf
@@ -0,0 +1,30 @@
+<!-- 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.Security"/>
+    <allow receive_sender="org.bluez.Security"/>
+  </policy>
+
+</busconfig>
diff --git a/hcid/bluez-hcid.conf b/hcid/bluez-hcid.conf
deleted file mode 100644
index 0b1fe4b2..00000000
--- a/hcid/bluez-hcid.conf
+++ /dev/null
@@ -1,30 +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 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.Security"/>
-    <allow receive_sender="org.bluez.Security"/>
-  </policy>
-
-</busconfig>
-- 
cgit