diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-09-25 14:14:01 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 12:00:23 +0100 |
| commit | adeba9a4cbe5c2fbcdbbcd59d559b6c3432ef4e4 (patch) | |
| tree | 2a3cbe510b71e6b60819eb8e85f3b254418bd8ed /meta/recipes-connectivity/connman/connman.inc | |
| parent | 907c8a7068791fb466867a29e881361b1639eae5 (diff) | |
| download | poky-adeba9a4cbe5c2fbcdbbcd59d559b6c3432ef4e4.tar.gz | |
connman: Don't use a blanket "allow" D-Bus policy
There are already "allow" rules for root and conditionally xuser to
send messages to connman: there should be no reason for a default
allow policy.
Also, conditionally add a policy to allow xuser to send to the
connman vpn service (similar to main service).
(From OE-Core rev: 7c75981944e92b5534b054058407d19de2a8a78c)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman/connman.inc')
| -rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 6c062ae7a1..1712af3016 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
| @@ -70,13 +70,7 @@ SYSTEMD_SERVICE_${PN} = "connman.service" | |||
| 70 | SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" | 70 | SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" |
| 71 | SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" | 71 | SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" |
| 72 | 72 | ||
| 73 | # This allows *everyone* to access ConnMan over DBus, without any access | ||
| 74 | # control. Really the at_console flag should work, which would mean that | ||
| 75 | # both this and the xuser patch can be dropped. | ||
| 76 | do_compile_append() { | 73 | do_compile_append() { |
| 77 | sed -i -e s:deny:allow:g ${S}/src/connman-dbus.conf | ||
| 78 | sed -i -e s:deny:allow:g ${S}/vpn/vpn-dbus.conf | ||
| 79 | |||
| 80 | sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service | 74 | sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service |
| 81 | } | 75 | } |
| 82 | 76 | ||
