diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-23 07:34:33 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-23 07:34:33 +0000 |
| commit | a93a56e08f57ee03f3cbddf61223d7a06cf4610e (patch) | |
| tree | e8d12530532e79c918c74ad868f8179a9ae72118 /hcid | |
| parent | 1bc5e02b94a1524de2ccb7e2f0704a895ad77de6 (diff) | |
Move bluetooth.conf D-Bus security file into daemon directory
Diffstat (limited to 'hcid')
| -rw-r--r-- | hcid/Makefile.am | 6 | ||||
| -rw-r--r-- | hcid/bluetooth.conf | 33 |
2 files changed, 1 insertions, 38 deletions
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> |