From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 24 Jun 2011 18:40:00 +0000 (+0200)
Subject: logind: make sure we hand out write fd, and keep read fd for session end detection
X-Git-Tag: v30~158
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19bc719ec28e731159671b06254d9bfd49014894;p=systemd

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

diff --git a/TODO b/TODO
index aab4431d..d7c92e13 100644
--- 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 2a379a2b..93a19a45 100644
--- 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 10a826bc..693906ef 100644
--- 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;