korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-17 01:04:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't use a D-Bus well known name at the moment

Browse Source
This commit is contained in:
Marcel Holtmann 2007-01-20 14:30:42 +00:00
parent 0e6a5eb8fc
commit 818744abec
3 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
input/Makefile.am
View File

@ -1,10 +1,4 @@
if CONFIGFILES
dbusdir = $(sysconfdir)/dbus-1/system.d
dbus_DATA = bluetooth-input.conf
endif
servicedir = $(libdir)/bluetooth
noinst_PROGRAMS = bluetoothd-service-input
@ -19,6 +13,6 @@ AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
INCLUDES = -I$(top_srcdir)/common
EXTRA_DIST = bluetooth-input.conf
EXTRA_DIST = input-api.txt
MAINTAINERCLEANFILES = Makefile.in

21
input/bluetooth-input.conf
View File

@ -1,21 +0,0 @@
<!-- This configuration file specifies the required security policies
for Bluetooth input 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.input"/>
</policy>
<policy at_console="true">
<allow send_destination="org.bluez.Input"/>
<allow receive_sender="org.bluez.Input"/>
<allow send_path="/org/bluez/input"/>
</policy>
</busconfig>

3
input/input-service.c
View File

@ -44,7 +44,6 @@
#include "textfile.h"
#include "input-service.h"
#define INPUT_SERVICE "org.bluez.input"
#define INPUT_PATH "/org/bluez/input"
#define INPUT_MANAGER_INTERFACE "org.bluez.input.Manager"
#define INPUT_DEVICE_INTERFACE "org.bluez.input.Device"
@ -688,7 +687,7 @@ int input_dbus_init(void)
DBusError derr;
const char *adapter;
connection = init_dbus(INPUT_SERVICE, NULL, NULL);
connection = init_dbus(NULL, NULL, NULL);
if (!connection)
return -1;