logind: automatically determine client side PID if GetSessionByPID() is called with...

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

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 532b48ff6bea2f75aa2a56d9155383bfc1e861db..7e22b842a4e68f9eb17d7be69e4390d165b37e86 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -157,17 +157,25 @@ static int method_get_session_by_pid(sd_bus *bus, sd_bus_message *message, void
         _cleanup_free_ char *p = NULL;
         Session *session = NULL;
         Manager *m = userdata;
-        uint32_t pid;
+        pid_t pid;
         int r;
 
         assert(bus);
         assert(message);
         assert(m);
 
+        assert_cc(sizeof(pid_t) == sizeof(uint32_t));
+
         r = sd_bus_message_read(message, "u", &pid);
         if (r < 0)
                 return sd_bus_reply_method_errno(bus, message, r, NULL);
 
+        if (pid == 0) {
+                r = sd_bus_get_owner_pid(bus, sd_bus_message_get_sender(message), &pid);
+                if (r < 0)
+                        return sd_bus_reply_method_errno(bus, message, r, NULL);
+        }
+
         r = manager_get_session_by_pid(m, pid, &session);
         if (r < 0)
                 return sd_bus_reply_method_errno(bus, message, r, NULL);
@@ -211,17 +219,25 @@ static int method_get_user_by_pid(sd_bus *bus, sd_bus_message *message, void *us
         _cleanup_free_ char *p = NULL;
         Manager *m = userdata;
         User *user = NULL;
-        uint32_t pid;
+        pid_t pid;
         int r;
 
         assert(bus);
         assert(message);
         assert(m);
 
+        assert_cc(sizeof(pid_t) == sizeof(uint32_t));
+
         r = sd_bus_message_read(message, "u", &pid);
         if (r < 0)
                 return sd_bus_reply_method_errno(bus, message, r, NULL);
 
+        if (pid == 0) {
+                r = sd_bus_get_owner_pid(bus, sd_bus_message_get_sender(message), &pid);
+                if (r < 0)
+                        return sd_bus_reply_method_errno(bus, message, r, NULL);
+        }
+
         r = manager_get_user_by_pid(m, pid, &user);
         if (r < 0)
                 return sd_bus_reply_method_errno(bus, message, r, NULL);
@@ -1369,7 +1385,7 @@ static int send_prepare_for(Manager *m, InhibitWhat w, bool _active) {
                                   "org.freedesktop.login1.Manager",
                                   signal_name[w],
                                   "b",
-                                  &active);
+                                  active);
 }
 
 int bus_manager_shutdown_or_sleep_now_or_later(