summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-06-07 04:15:37 +0200
committerLennart Poettering <lennart@poettering.net>2010-06-07 04:15:37 +0200
commitaf25ec12e3d39d65f77633182799f3da695f2868 (patch)
treefbfda696153efe9422a73821c5b2d6ef4ff4d2fb
parentd122948d6fbaac4505cf14a08f1237daa89efdd0 (diff)
dbus: allow systemd to receive activation requests
-rw-r--r--src/dbus.c2
-rw-r--r--src/org.freedesktop.systemd1.conf5
2 files changed, 7 insertions, 0 deletions
diff --git a/src/dbus.c b/src/dbus.c
index 7e6d65e2c8..a14dbda9d2 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -397,6 +397,8 @@ static DBusHandlerResult api_bus_message_filter(DBusConnection *connection, DBu
if (r < 0) {
const char *id, *text;
+ log_warning("D-Bus activation failed for %s: %s", name, strerror(-r));
+
if (!(reply = dbus_message_new_signal("/org/freedesktop/systemd1", "org.freedesktop.systemd1.Activator", "ActivationFailure")))
goto oom;
diff --git a/src/org.freedesktop.systemd1.conf b/src/org.freedesktop.systemd1.conf
index 377e001dee..831df59d53 100644
--- a/src/org.freedesktop.systemd1.conf
+++ b/src/org.freedesktop.systemd1.conf
@@ -16,8 +16,13 @@
<policy user="root">
<allow own="org.freedesktop.systemd1"/>
+ <!-- Root clients can do everything -->
<allow send_destination="org.freedesktop.systemd1"/>
<allow receive_sender="org.freedesktop.systemd1"/>
+
+ <!-- systemd may receive activator requests -->
+ <allow receive_interface="org.freedesktop.systemd1.Activator"
+ receive_member="ActivationRequest"/>
</policy>
<policy context="default">