diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2009-01-07 17:37:26 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-01-07 17:37:26 +0100 |
| commit | f5b24ac0b5d57328cf8649dcdae73c40db2bb59e (patch) | |
| tree | cfcea24c67516dbfe49e2f3c18ee0e68358f7f1b | |
| parent | a48010072c90de9278b63fff0fbdf6e98f138517 (diff) | |
| download | connman-f5b24ac0b5d57328cf8649dcdae73c40db2bb59e.tar.gz connman-f5b24ac0b5d57328cf8649dcdae73c40db2bb59e.tar.bz2 connman-f5b24ac0b5d57328cf8649dcdae73c40db2bb59e.zip | |
Install different D-Bus configuration if PolicyKit is enabled
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 11 | ||||
| -rw-r--r-- | src/connman-dbus.conf (renamed from src/connman.conf) | 1 | ||||
| -rw-r--r-- | src/connman-polkit.conf | 11 |
4 files changed, 21 insertions, 3 deletions
@@ -27,6 +27,7 @@ src/version.h src/connmand src/connman.exp src/connman.ver +src/connman.conf src/connman.service src/*-connman.rules scripts/connman diff --git a/src/Makefile.am b/src/Makefile.am index a1cfcc2d..a540bf12 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,7 @@ connmand_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=connman.ver connmand_DEPENDENCIES = connman.ver -CLEANFILES = connman.ver connman.exp 92-connman.rules +CLEANFILES = connman.ver connman.exp connman.conf 92-connman.rules statedir = $(localstatedir)/run/connman @@ -42,7 +42,7 @@ AM_CFLAGS = @UDEV_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \ -DPLUGINDIR=\""$(plugindir)"\" INCLUDES = -I$(top_builddir)/include -EXTRA_DIST = $(dbus_DATA) connman.rules +EXTRA_DIST = connman-dbus.conf connman-polkit.conf connman.rules MAINTAINERCLEANFILES = Makefile.in @@ -54,5 +54,12 @@ connman.ver: connman.exp cat $< | sed -e "s/\(.*\)/\1;/" >> $@ echo "local: *; };" >> $@ +connman.conf: connman-dbus.conf connman-polkit.conf +if POLKIT + cp $(top_srcdir)/src/connman-polkit.conf $@ +else + cp $(top_srcdir)/src/connman-dbus.conf $@ +endif + 92-connman.rules: connman.rules cp $< $@ diff --git a/src/connman.conf b/src/connman-dbus.conf index 55f76d6a..b4d4acd1 100644 --- a/src/connman.conf +++ b/src/connman-dbus.conf @@ -10,7 +10,6 @@ <allow send_destination="org.moblin.connman"/> </policy> <policy context="default"> - <!-- use "allow" with enabled PolicyKit support --> <deny send_destination="org.moblin.connman"/> </policy> </busconfig> diff --git a/src/connman-polkit.conf b/src/connman-polkit.conf new file mode 100644 index 00000000..9e44b8b5 --- /dev/null +++ b/src/connman-polkit.conf @@ -0,0 +1,11 @@ +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <policy user="root"> + <allow own="org.moblin.connman"/> + <allow send_interface="org.moblin.connman.Agent"/> + </policy> + <policy context="default"> + <allow send_destination="org.moblin.connman"/> + </policy> +</busconfig> |