#include "strv.h"
#include "bus-util.h"
#include "bus-errors.h"
+#include "bus-label.h"
#include "logind.h"
#include "logind-session.h"
assert(message);
assert(s);
- r = session_stop(s);
+ r = session_stop(s, true);
if (r < 0)
return r;
return r;
if (uid != 0 && uid != s->user->uid)
- return sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Only owner of session my set idle hint");
+ return sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Only owner of session may set idle hint");
session_set_idle_hint(s, b);
sd_bus_message *message;
pid_t pid;
- message = sd_bus_get_current(bus);
+ message = sd_bus_get_current_message(bus);
if (!message)
return 0;
if (!p)
return 0;
- e = sd_bus_label_unescape(p);
+ e = bus_label_unescape(p);
if (!e)
return -ENOMEM;
assert(s);
- t = sd_bus_label_escape(s->id);
+ t = bus_label_escape(s->id);
if (!t)
return NULL;
if (!p)
return -ENOMEM;
- r = strv_push(&l, p);
- if (r < 0) {
- free(p);
+ r = strv_consume(&l, p);
+ if (r < 0)
return r;
- }
}
*nodes = l;
return -ENOMEM;
log_debug("Sending reply about created session: "
- "id=%s object_path=%s runtime_path=%s session_fd=%d seat=%s vtnr=%u",
+ "id=%s object_path=%s uid=%u runtime_path=%s "
+ "session_fd=%d seat=%s vtnr=%u",
s->id,
p,
+ (uint32_t) s->user->uid,
s->user->runtime_path,
fifo_fd,
s->seat ? s->seat->id : "",