-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include "alloc-util.h"
+#include "bus-get-properties.h"
#include "bus-polkit.h"
#include "bus-util.h"
#include "format-util.h"
void *userdata,
sd_bus_error *error) {
- User *u = userdata;
+ User *u = ASSERT_PTR(userdata);
assert(bus);
assert(reply);
- assert(u);
return sd_bus_message_append(reply, "u", (uint32_t) u->user_record->uid);
}
void *userdata,
sd_bus_error *error) {
- User *u = userdata;
+ User *u = ASSERT_PTR(userdata);
assert(bus);
assert(reply);
- assert(u);
return sd_bus_message_append(reply, "u", (uint32_t) u->user_record->gid);
}
void *userdata,
sd_bus_error *error) {
- User *u = userdata;
+ User *u = ASSERT_PTR(userdata);
assert(bus);
assert(reply);
- assert(u);
return sd_bus_message_append(reply, "s", u->user_record->user_name);
}
sd_bus_error *error) {
_cleanup_free_ char *p = NULL;
- User *u = userdata;
+ User *u = ASSERT_PTR(userdata);
assert(bus);
assert(reply);
- assert(u);
p = u->display ? session_bus_path(u->display) : strdup("/");
if (!p)
void *userdata,
sd_bus_error *error) {
- User *u = userdata;
- Session *session;
+ User *u = ASSERT_PTR(userdata);
int r;
assert(bus);
assert(reply);
- assert(u);
r = sd_bus_message_open_container(reply, 'a', "(so)");
if (r < 0)
void *userdata,
sd_bus_error *error) {
- User *u = userdata;
+ User *u = ASSERT_PTR(userdata);
assert(bus);
assert(reply);
- assert(u);
return sd_bus_message_append(reply, "b", user_get_idle_hint(u, NULL) > 0);
}
void *userdata,
sd_bus_error *error) {
- User *u = userdata;
+ User *u = ASSERT_PTR(userdata);
dual_timestamp t = DUAL_TIMESTAMP_NULL;
uint64_t k;
assert(bus);
assert(reply);
- assert(u);
(void) user_get_idle_hint(u, &t);
k = streq(property, "IdleSinceHint") ? t.realtime : t.monotonic;
void *userdata,
sd_bus_error *error) {
- User *u = userdata;
+ User *u = ASSERT_PTR(userdata);
int r;
assert(bus);
assert(reply);
- assert(u);
r = user_check_linger_file(u);
}
int bus_user_method_terminate(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- User *u = userdata;
+ User *u = ASSERT_PTR(userdata);
int r;
assert(message);
- assert(u);
r = bus_verify_polkit_async(
message,
if (r == 0)
return 1; /* Will call us back */
- r = user_stop(u, true);
+ r = user_stop(u, /* force = */ true);
if (r < 0)
return r;
}
int bus_user_method_kill(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- User *u = userdata;
+ User *u = ASSERT_PTR(userdata);
int32_t signo;
int r;
assert(message);
- assert(u);
r = bus_verify_polkit_async(
message,
return sd_bus_reply_method_return(message, NULL);
}
-const sd_bus_vtable user_vtable[] = {
- SD_BUS_VTABLE_START(0),
-
- SD_BUS_PROPERTY("UID", "u", property_get_uid, 0, SD_BUS_VTABLE_PROPERTY_CONST),
- SD_BUS_PROPERTY("GID", "u", property_get_gid, 0, SD_BUS_VTABLE_PROPERTY_CONST),
- SD_BUS_PROPERTY("Name", "s", property_get_name, 0, SD_BUS_VTABLE_PROPERTY_CONST),
- BUS_PROPERTY_DUAL_TIMESTAMP("Timestamp", offsetof(User, timestamp), SD_BUS_VTABLE_PROPERTY_CONST),
- SD_BUS_PROPERTY("RuntimePath", "s", NULL, offsetof(User, runtime_path), SD_BUS_VTABLE_PROPERTY_CONST),
- SD_BUS_PROPERTY("Service", "s", NULL, offsetof(User, service), SD_BUS_VTABLE_PROPERTY_CONST),
- SD_BUS_PROPERTY("Slice", "s", NULL, offsetof(User, slice), SD_BUS_VTABLE_PROPERTY_CONST),
- SD_BUS_PROPERTY("Display", "(so)", property_get_display, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
- SD_BUS_PROPERTY("State", "s", property_get_state, 0, 0),
- SD_BUS_PROPERTY("Sessions", "a(so)", property_get_sessions, 0, 0),
- SD_BUS_PROPERTY("IdleHint", "b", property_get_idle_hint, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
- SD_BUS_PROPERTY("IdleSinceHint", "t", property_get_idle_since_hint, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
- SD_BUS_PROPERTY("IdleSinceHintMonotonic", "t", property_get_idle_since_hint, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
- SD_BUS_PROPERTY("Linger", "b", property_get_linger, 0, 0),
-
- SD_BUS_METHOD("Terminate", NULL, NULL, bus_user_method_terminate, SD_BUS_VTABLE_UNPRIVILEGED),
- SD_BUS_METHOD("Kill", "i", NULL, bus_user_method_kill, SD_BUS_VTABLE_UNPRIVILEGED),
-
- SD_BUS_VTABLE_END
-};
-
-int user_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
- Manager *m = userdata;
+static int user_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
+ Manager *m = ASSERT_PTR(userdata);
uid_t uid;
User *user;
int r;
assert(path);
assert(interface);
assert(found);
- assert(m);
if (streq(path, "/org/freedesktop/login1/user/self")) {
sd_bus_message *message;
return s;
}
-int user_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {
+static int user_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {
_cleanup_strv_free_ char **l = NULL;
sd_bus_message *message;
Manager *m = userdata;
User *user;
- Iterator i;
int r;
assert(bus);
assert(path);
assert(nodes);
- HASHMAP_FOREACH(user, m->users, i) {
+ HASHMAP_FOREACH(user, m->users) {
char *p;
p = user_bus_path(user);
return 1;
}
+static const sd_bus_vtable user_vtable[] = {
+ SD_BUS_VTABLE_START(0),
+
+ SD_BUS_PROPERTY("UID", "u", property_get_uid, 0, SD_BUS_VTABLE_PROPERTY_CONST),
+ SD_BUS_PROPERTY("GID", "u", property_get_gid, 0, SD_BUS_VTABLE_PROPERTY_CONST),
+ SD_BUS_PROPERTY("Name", "s", property_get_name, 0, SD_BUS_VTABLE_PROPERTY_CONST),
+ BUS_PROPERTY_DUAL_TIMESTAMP("Timestamp", offsetof(User, timestamp), SD_BUS_VTABLE_PROPERTY_CONST),
+ SD_BUS_PROPERTY("RuntimePath", "s", NULL, offsetof(User, runtime_path), SD_BUS_VTABLE_PROPERTY_CONST),
+ SD_BUS_PROPERTY("Service", "s", NULL, offsetof(User, service), SD_BUS_VTABLE_PROPERTY_CONST),
+ SD_BUS_PROPERTY("Slice", "s", NULL, offsetof(User, slice), SD_BUS_VTABLE_PROPERTY_CONST),
+ SD_BUS_PROPERTY("Display", "(so)", property_get_display, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("State", "s", property_get_state, 0, 0),
+ SD_BUS_PROPERTY("Sessions", "a(so)", property_get_sessions, 0, 0),
+ SD_BUS_PROPERTY("IdleHint", "b", property_get_idle_hint, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("IdleSinceHint", "t", property_get_idle_since_hint, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("IdleSinceHintMonotonic", "t", property_get_idle_since_hint, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("Linger", "b", property_get_linger, 0, 0),
+
+ SD_BUS_METHOD("Terminate", NULL, NULL, bus_user_method_terminate, SD_BUS_VTABLE_UNPRIVILEGED),
+ SD_BUS_METHOD_WITH_ARGS("Kill",
+ SD_BUS_ARGS("i", signal_number),
+ SD_BUS_NO_RESULT,
+ bus_user_method_kill,
+ SD_BUS_VTABLE_UNPRIVILEGED),
+
+ SD_BUS_VTABLE_END
+};
+
+const BusObjectImplementation user_object = {
+ "/org/freedesktop/login1/user",
+ "org.freedesktop.login1.User",
+ .fallback_vtables = BUS_FALLBACK_VTABLES({user_vtable, user_object_find}),
+ .node_enumerator = user_node_enumerator,
+};
+
int user_send_signal(User *u, bool new_user) {
_cleanup_free_ char *p = NULL;
projects / thirdparty / systemd.git / blobdiff