X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-user-dbus.c;h=5cfaac0d4f0ddcca0d170a7f3630b1d1fe33fecc;hb=1433efd219a6df414a1821b3d3d70d86201ed3e4;hp=bff42e89ad39c54ea7ce8ab932ea9ddf6ac9b166;hpb=8cb4ab0058e51f1fba93683d145ef95f97c2fa86;p=elogind.git diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c index bff42e89a..5cfaac0d4 100644 --- a/src/login/logind-user-dbus.c +++ b/src/login/logind-user-dbus.c @@ -291,6 +291,7 @@ char *user_bus_path(User *u) { 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; @@ -312,9 +313,24 @@ int user_node_enumerator(sd_bus *bus, const char *path, void *userdata, char *** return r; } - r = strv_extend(&l, "/org/freedesktop/login1/user/self"); - if (r < 0) - return r; + message = sd_bus_get_current_message(bus); + if (message) { + _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; + uid_t uid; + + r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_OWNER_UID|SD_BUS_CREDS_AUGMENT, &creds); + if (r >= 0) { + r = sd_bus_creds_get_owner_uid(creds, &uid); + if (r >= 0) { + user = hashmap_get(m->users, UID_TO_PTR(uid)); + if (user) { + r = strv_extend(&l, "/org/freedesktop/login1/user/self"); + if (r < 0) + return r; + } + } + } + } *nodes = l; l = NULL;