logind: unify how we cast between uid_t and pointers for hashmap keys

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

diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index 817bbb87e7bb853527004017293d36312aa28a4a..bff42e89ad39c54ea7ce8ab932ea9ddf6ac9b166 100644 (file)
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -21,7 +21,6 @@
 
 #include <errno.h>
 #include <string.h>
-#include <sys/capability.h>
 
 #include "strv.h"
 #include "bus-util.h"
@@ -180,7 +179,7 @@ static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata
         assert(message);
         assert(u);
 
-        r = user_stop(u);
+        r = user_stop(u, true);
         if (r < 0)
                 return r;
 
@@ -213,15 +212,14 @@ static int method_kill(sd_bus *bus, sd_bus_message *message, void *userdata, sd_
 const sd_bus_vtable user_vtable[] = {
         SD_BUS_VTABLE_START(0),
 
-        SD_BUS_PROPERTY("UID", "u", bus_property_get_uid, offsetof(User, uid), 0),
-        SD_BUS_PROPERTY("GID", "u", bus_property_get_gid, offsetof(User, gid), 0),
-        SD_BUS_PROPERTY("Name", "s", NULL, offsetof(User, name), 0),
-        SD_BUS_PROPERTY("Timestamp", "t", NULL, offsetof(User, timestamp.realtime), 0),
-        SD_BUS_PROPERTY("TimestampMonotonic", "t", NULL, offsetof(User, timestamp.monotonic), 0),
-        SD_BUS_PROPERTY("RuntimePath", "s", NULL, offsetof(User, runtime_path), 0),
-        SD_BUS_PROPERTY("Service", "s", NULL, offsetof(User, service), 0),
-        SD_BUS_PROPERTY("Slice", "s", NULL, offsetof(User, slice), 0),
-        SD_BUS_PROPERTY("Display", "(so)", property_get_display, 0, 0),
+        SD_BUS_PROPERTY("UID", "u", bus_property_get_uid, offsetof(User, uid), SD_BUS_VTABLE_PROPERTY_CONST),
+        SD_BUS_PROPERTY("GID", "u", bus_property_get_gid, offsetof(User, gid), SD_BUS_VTABLE_PROPERTY_CONST),
+        SD_BUS_PROPERTY("Name", "s", NULL, offsetof(User, name), 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, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_PROPERTY("IdleHint", "b", property_get_idle_hint, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
@@ -237,6 +235,7 @@ const sd_bus_vtable user_vtable[] = {
 
 int user_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
         Manager *m = userdata;
+        uid_t uid;
         User *user;
         int r;
 
@@ -249,39 +248,31 @@ int user_object_find(sd_bus *bus, const char *path, const char *interface, void
         if (streq(path, "/org/freedesktop/login1/user/self")) {
                 _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
                 sd_bus_message *message;
-                pid_t pid;
 
-                message = sd_bus_get_current(bus);
+                message = sd_bus_get_current_message(bus);
                 if (!message)
                         return 0;
 
-                r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_PID, &creds);
+                r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_OWNER_UID|SD_BUS_CREDS_AUGMENT, &creds);
                 if (r < 0)
                         return r;
 
-                r = sd_bus_creds_get_pid(creds, &pid);
-                if (r < 0)
-                        return r;
-
-                r = manager_get_user_by_pid(m, pid, &user);
-                if (r <= 0)
-                        return 0;
+                r = sd_bus_creds_get_owner_uid(creds, &uid);
         } else {
-                unsigned long lu;
                 const char *p;
 
                 p = startswith(path, "/org/freedesktop/login1/user/_");
                 if (!p)
                         return 0;
 
-                r = safe_atolu(p, &lu);
-                if (r < 0)
-                        return 0;
-
-                user = hashmap_get(m->users, ULONG_TO_PTR(lu));
-                if (!user)
-                        return 0;
+                r = parse_uid(p, &uid);
         }
+        if (r < 0)
+                return 0;
+
+        user = hashmap_get(m->users, UID_TO_PTR(uid));
+        if (!user)
+                return 0;
 
         *found = user;
         return 1;
@@ -292,7 +283,7 @@ char *user_bus_path(User *u) {
 
         assert(u);
 
-        if (asprintf(&s, "/org/freedesktop/login1/user/_%llu", (unsigned long long) u->uid) < 0)
+        if (asprintf(&s, "/org/freedesktop/login1/user/_"UID_FMT, u->uid) < 0)
                 return NULL;
 
         return s;
@@ -316,13 +307,15 @@ int user_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***
                 if (!p)
                         return -ENOMEM;
 
-                r = strv_push(&l, p);
-                if (r < 0) {
-                        free(p);
+                r = strv_consume(&l, p);
+                if (r < 0)
                         return r;
-                }
         }
 
+        r = strv_extend(&l, "/org/freedesktop/login1/user/self");
+        if (r < 0)
+                return r;
+
         *nodes = l;
         l = NULL;