logind: make sure we hand out write fd, and keep read fd for session end detection

diff --git a/TODO b/TODO
index aab4431de21dab0eb332fb6891ecb76e17fa243e..d7c92e13b2351dde10461e5c09d6474918786a14 100644 (file)
--- a/TODO
+++ b/TODO
@@ -80,6 +80,8 @@ Features:
 
 * avoid DefaultStandardOutput=syslog to have any effect on StandardInput=socket services
 
+* cgroup_notify_empty(): recursively check groups up the tree, too
+
 * fix alsa mixer restore to not print error when no config is stored
 
 * show enablement status in systemctl status

diff --git a/src/dbus.c b/src/dbus.c
index 2a379a2b3e0dd69dfeeb5c74f8422f7a85ea48e8..93a19a45cd111321827a3d86d03674da60fa475d 100644 (file)
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -446,7 +446,7 @@ static DBusHandlerResult system_bus_message_filter(DBusConnection *connection, D
                 if (!dbus_message_get_args(message, &error,
                                            DBUS_TYPE_STRING, &cgroup,
                                            DBUS_TYPE_INVALID))
-                        log_error("Failed to parse Released message: %s", error.message);
+                        log_error("Failed to parse Released message: %s", bus_error_message(&error));
                 else
                         cgroup_notify_empty(m, cgroup);
         }

diff --git a/src/logind-dbus.c b/src/logind-dbus.c
index 10a826bc94327c93d67f81bae80e24ea51f98cb7..693906ef70e05cbd8d0a8b2b6ab7aa2c4b1451d3 100644 (file)
--- a/src/logind-dbus.c
+++ b/src/logind-dbus.c
@@ -382,8 +382,8 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message, DBusMess
                 goto fail;
         }
 
-        session->pipe_fd = pipe_fds[1];
-        pipe_fds[1] = -1;
+        session->pipe_fd = pipe_fds[0];
+        pipe_fds[0] = -1;
 
         if (s) {
                 r = seat_attach_session(s, session);
@@ -412,7 +412,7 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message, DBusMess
                         DBUS_TYPE_STRING, &session->id,
                         DBUS_TYPE_OBJECT_PATH, &p,
                         DBUS_TYPE_STRING, &session->user->runtime_path,
-                        DBUS_TYPE_UNIX_FD, &pipe_fds[0],
+                        DBUS_TYPE_UNIX_FD, &pipe_fds[1],
                         DBUS_TYPE_INVALID);
         free(p);
 
@@ -421,7 +421,7 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message, DBusMess
                 goto fail;
         }
 
-        close_nointr_nofail(pipe_fds[0]);
+        close_nointr_nofail(pipe_fds[1]);
         *_reply = reply;
 
         return 0;