#include "bus-util.h"
#include "bus-error.h"
#include "logind.h"
+#include "bus-errors.h"
static int property_get_idle_hint(
sd_bus *bus,
_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);
p = session_bus_path(session);
if (!p)
- return sd_bus_reply_method_errno(bus, message, -ENOMEM, NULL);
+ return sd_bus_reply_method_errno(bus, message, ENOMEM, NULL);
return sd_bus_reply_method_return(bus, message, "o", p);
}
_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);
HASHMAP_FOREACH(inhibitor, m->inhibitors, i) {
- r = sd_bus_message_append(reply, "ssssuu",
+ r = sd_bus_message_append(reply, "(ssssuu)",
strempty(inhibit_what_to_string(inhibitor->what)),
strempty(inhibitor->who),
strempty(inhibitor->why),
"org.freedesktop.login1.Manager",
signal_name[w],
"b",
- &active);
+ active);
}
int bus_manager_shutdown_or_sleep_now_or_later(
if (r < 0)
return r;
- r = sd_bus_send_with_reply_and_block(manager->bus, m, 0, error, &reply);
+ r = sd_bus_call(manager->bus, m, 0, error, &reply);
if (r < 0)
return r;