logind: when a bus call is done on a session, user or seat, optionally determine...

[elogind.git] / src / login / logind-seat-dbus.c

diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index fb32b139fc1bdc745de7da0a72bc8b3a659d8f5a..ddf2cd84a7c963e240840b3d00e6ebde60d5f44d 100644 (file)
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -326,25 +326,22 @@ int seat_object_find(sd_bus *bus, const char *path, const char *interface, void
                 _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
                 sd_bus_message *message;
                 Session *session;
-                pid_t pid;
+                const char *name;
 
                 message = sd_bus_get_current_message(bus);
                 if (!message)
                         return 0;
 
-                r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_PID, &creds);
+                r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_SESSION|SD_BUS_CREDS_AUGMENT, &creds);
                 if (r < 0)
                         return r;
 
-                r = sd_bus_creds_get_pid(creds, &pid);
+                r = sd_bus_creds_get_session(creds, &name);
                 if (r < 0)
                         return r;
 
-                r = manager_get_session_by_pid(m, pid, &session);
-                if (r <= 0)
-                        return 0;
-
-                if (!session->seat)
+                session = hashmap_get(m->sessions, name);
+                if (!session)
                         return 0;
 
                 seat = session->seat;
@@ -361,10 +358,11 @@ int seat_object_find(sd_bus *bus, const char *path, const char *interface, void
                         return -ENOMEM;
 
                 seat = hashmap_get(m->seats, e);
-                if (!seat)
-                        return 0;
         }
 
+        if (!seat)
+                return 0;
+
         *found = seat;
         return 1;
 }