[systemd-commits] src/login

[Michal Schmidt]

 src/login/logind-dbus.c |   27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

New commits:
commit 2154761fbbc931e3e3d83100fa42609c99cd2536
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Jun 12 09:31:43 2012 +0200

    logind: fix check for multiple sessions
    
    The "$action-multiple-sessions" polkit actions are defined as
    "$action while other users are logged in". To me this implies that the
    following sessions should not count:
     - greeter sessions
     - user sessions belonging to the same user as the one who's asking
    
    Not sure how to treat class SESSION_LOCK_SCREEN. I never have these.
    I just ignore every class that's not SESSION_USER.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=814424

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 17bd5e5..3cde831 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -930,27 +930,20 @@ static int have_multiple_sessions(
                 DBusMessage *message,
                 DBusError *error) {
 
-        Session *s;
+        Session *session;
+        Iterator i;
+        unsigned long ul;
 
         assert(m);
 
-        if (hashmap_size(m->sessions) > 1)
-                return true;
-
-        /* Hmm, there's only one session, but let's make sure it
-         * actually belongs to the user who is asking. If not, better
-         * be safe than sorry. */
-
-        s = hashmap_first(m->sessions);
-        if (s) {
-                unsigned long ul;
-
-                ul = dbus_bus_get_unix_user(connection, dbus_message_get_sender(message), error);
-                if (ul == (unsigned long) -1)
-                        return -EIO;
+        ul = dbus_bus_get_unix_user(connection, dbus_message_get_sender(message), error);
+        if (ul == (unsigned long) -1)
+                return -EIO;
 
-                return s->user->uid != ul;
-        }
+        /* Check for other users' sessions. Greeter sessions do not count. */
+        HASHMAP_FOREACH(session, m->sessions, i)
+                if (session->class == SESSION_USER && session->user->uid != ul)
+                        return true;
 
         return false;
 }