-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include "alloc-util.h"
#include "bus-common-errors.h"
+#include "bus-get-properties.h"
#include "bus-label.h"
#include "bus-polkit.h"
#include "bus-util.h"
#include "logind-dbus.h"
+#include "logind-polkit.h"
#include "logind-seat-dbus.h"
#include "logind-seat.h"
#include "logind-session-dbus.h"
sd_bus_error *error) {
_cleanup_free_ char *p = NULL;
- Seat *s = userdata;
+ Seat *s = ASSERT_PTR(userdata);
assert(bus);
assert(reply);
- assert(s);
p = s->active ? session_bus_path(s->active) : strdup("/");
if (!p)
void *userdata,
sd_bus_error *error) {
- Seat *s = userdata;
- Session *session;
+ Seat *s = ASSERT_PTR(userdata);
int r;
assert(bus);
assert(reply);
- assert(s);
r = sd_bus_message_open_container(reply, 'a', "(so)");
if (r < 0)
void *userdata,
sd_bus_error *error) {
- Seat *s = userdata;
+ Seat *s = ASSERT_PTR(userdata);
assert(bus);
assert(reply);
- assert(s);
return sd_bus_message_append(reply, "b", seat_get_idle_hint(s, NULL) > 0);
}
void *userdata,
sd_bus_error *error) {
- Seat *s = userdata;
+ Seat *s = ASSERT_PTR(userdata);
dual_timestamp t;
uint64_t u;
int r;
assert(bus);
assert(reply);
- assert(s);
r = seat_get_idle_hint(s, &t);
if (r < 0)
}
int bus_seat_method_terminate(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Seat *s = userdata;
+ Seat *s = ASSERT_PTR(userdata);
int r;
assert(message);
- assert(s);
r = bus_verify_polkit_async(
message,
if (r == 0)
return 1; /* Will call us back */
- r = seat_stop_sessions(s, true);
+ r = seat_stop_sessions(s, /* force = */ true);
if (r < 0)
return r;
}
static int method_activate_session(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Seat *s = userdata;
+ Seat *s = ASSERT_PTR(userdata);
const char *name;
Session *session;
int r;
assert(message);
- assert(s);
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
if (session->seat != s)
return sd_bus_error_setf(error, BUS_ERROR_SESSION_NOT_ON_SEAT, "Session %s not on seat %s", name, s->id);
- r = bus_verify_polkit_async(
- message,
- CAP_SYS_ADMIN,
- "org.freedesktop.login1.chvt",
- NULL,
- false,
- UID_INVALID,
- &s->manager->polkit_registry,
- error);
+ r = check_polkit_chvt(message, s->manager, error);
if (r < 0)
return r;
if (r == 0)
}
static int method_switch_to(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Seat *s = userdata;
+ Seat *s = ASSERT_PTR(userdata);
unsigned to;
int r;
assert(message);
- assert(s);
r = sd_bus_message_read(message, "u", &to);
if (r < 0)
return r;
if (to <= 0)
- return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid virtual terminal");
+ return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid virtual terminal");
- r = bus_verify_polkit_async(
- message,
- CAP_SYS_ADMIN,
- "org.freedesktop.login1.chvt",
- NULL,
- false,
- UID_INVALID,
- &s->manager->polkit_registry,
- error);
+ r = check_polkit_chvt(message, s->manager, error);
if (r < 0)
return r;
if (r == 0)
}
static int method_switch_to_next(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Seat *s = userdata;
+ Seat *s = ASSERT_PTR(userdata);
int r;
assert(message);
- assert(s);
- r = bus_verify_polkit_async(
- message,
- CAP_SYS_ADMIN,
- "org.freedesktop.login1.chvt",
- NULL,
- false,
- UID_INVALID,
- &s->manager->polkit_registry,
- error);
+ r = check_polkit_chvt(message, s->manager, error);
if (r < 0)
return r;
if (r == 0)
}
static int method_switch_to_previous(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Seat *s = userdata;
+ Seat *s = ASSERT_PTR(userdata);
int r;
assert(message);
- assert(s);
- r = bus_verify_polkit_async(
- message,
- CAP_SYS_ADMIN,
- "org.freedesktop.login1.chvt",
- NULL,
- false,
- UID_INVALID,
- &s->manager->polkit_registry,
- error);
+ r = check_polkit_chvt(message, s->manager, error);
if (r < 0)
return r;
if (r == 0)
static int seat_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
_cleanup_free_ char *e = NULL;
sd_bus_message *message;
- Manager *m = userdata;
+ Manager *m = ASSERT_PTR(userdata);
const char *p;
Seat *seat;
int r;
assert(path);
assert(interface);
assert(found);
- assert(m);
p = startswith(path, "/org/freedesktop/login1/seat/");
if (!p)
sd_bus_message *message;
Manager *m = userdata;
Seat *seat;
- Iterator i;
int r;
assert(bus);
assert(path);
assert(nodes);
- HASHMAP_FOREACH(seat, m->seats, i) {
+ HASHMAP_FOREACH(seat, m->seats) {
char *p;
p = seat_bus_path(seat);
SD_BUS_METHOD("Terminate", NULL, NULL, bus_seat_method_terminate, SD_BUS_VTABLE_UNPRIVILEGED),
- SD_BUS_METHOD_WITH_NAMES("ActivateSession",
- "s",
- SD_BUS_PARAM(session_id),
- NULL,,
- method_activate_session,
- SD_BUS_VTABLE_UNPRIVILEGED),
- SD_BUS_METHOD_WITH_NAMES("SwitchTo",
- "u",
- SD_BUS_PARAM(vtnr),
- NULL,,
- method_switch_to,
- SD_BUS_VTABLE_UNPRIVILEGED),
+ SD_BUS_METHOD_WITH_ARGS("ActivateSession",
+ SD_BUS_ARGS("s", session_id),
+ SD_BUS_NO_RESULT,
+ method_activate_session,
+ SD_BUS_VTABLE_UNPRIVILEGED),
+ SD_BUS_METHOD_WITH_ARGS("SwitchTo",
+ SD_BUS_ARGS("u", vtnr),
+ SD_BUS_NO_RESULT,
+ method_switch_to,
+ SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("SwitchToNext", NULL, NULL, method_switch_to_next, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("SwitchToPrevious", NULL, NULL, method_switch_to_previous, SD_BUS_VTABLE_UNPRIVILEGED),