X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus.c;h=340e6af2c79c2e004904a893aee8d5ad947226c4;hp=0b93db55deda86d54b93815f8ed7ccd90c35d821;hb=3aef3aee6e2e3faf49ef09c7694374a75243f12c;hpb=9014a8bd7a88aa4794b730e7fccf7838a00ad351

diff --git a/src/dbus.c b/src/dbus.c
index 0b93db55d..340e6af2c 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 /***
   This file is part of systemd.
@@ -385,7 +385,7 @@ static DBusHandlerResult api_bus_message_filter(DBusConnection *connection, DBus
 
                         r = manager_load_unit(m, name, NULL, &error, &u);
 
-                        if (r >= 0 && u->meta.only_by_dependency)
+                        if (r >= 0 && u->meta.refuse_manual_start)
                                 r = -EPERM;
 
                         if (r >= 0)
@@ -454,7 +454,7 @@ static DBusHandlerResult system_bus_message_filter(DBusConnection *connection, D
                           dbus_message_get_path(message));
 
         if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) {
-                log_error("Warning! System D-Bus connection terminated.");
+                log_debug("System D-Bus connection terminated.");
                 bus_done_system(m);
 
         } else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Agent", "Released")) {
@@ -474,11 +474,14 @@ static DBusHandlerResult system_bus_message_filter(DBusConnection *connection, D
 
 static DBusHandlerResult private_bus_message_filter(DBusConnection *connection, DBusMessage *message, void *data) {
         Manager *m = data;
+        DBusError error;
 
         assert(connection);
         assert(message);
         assert(m);
 
+        dbus_error_init(&error);
+
         if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_METHOD_CALL ||
             dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_SIGNAL)
                 log_debug("Got D-Bus request: %s.%s() on %s",
@@ -488,6 +491,18 @@ static DBusHandlerResult private_bus_message_filter(DBusConnection *connection,
 
         if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected"))
                 shutdown_connection(m, connection);
+        else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Agent", "Released")) {
+                const char *cgroup;
+
+                if (!dbus_message_get_args(message, &error,
+                                           DBUS_TYPE_STRING, &cgroup,
+                                           DBUS_TYPE_INVALID))
+                        log_error("Failed to parse Released message: %s", error.message);
+                else
+                        cgroup_notify_empty(m, cgroup);
+        }
+
+        dbus_error_free(&error);
 
         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
@@ -801,7 +816,7 @@ static int bus_init_system(Manager *m) {
 
         if (m->api_bus != m->system_bus) {
                 char *id;
-                log_info("Successfully connected to system D-Bus bus %s as %s",
+                log_debug("Successfully connected to system D-Bus bus %s as %s",
                          strnull((id = dbus_connection_get_server_id(m->system_bus))),
                          strnull(dbus_bus_get_unique_name(m->system_bus)));
                 dbus_free(id);
@@ -887,7 +902,7 @@ static int bus_init_api(Manager *m) {
 
         if (m->api_bus != m->system_bus) {
                 char *id;
-                log_info("Successfully connected to API D-Bus bus %s as %s",
+                log_debug("Successfully connected to API D-Bus bus %s as %s",
                          strnull((id = dbus_connection_get_server_id(m->api_bus))),
                          strnull(dbus_bus_get_unique_name(m->api_bus)));
                 dbus_free(id);