X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-user-dbus.c;h=563c7ef6bec897325daa34c8479e2cd134bbc9c9;hb=261afec5ae96297b567c3735dc2cbd8bcf57d0c4;hp=fc71fcf22ec0103d15761b6d194835e0a1d78171;hpb=cc3773810855956bad92337cee8fa193584ab62e;p=elogind.git

diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index fc71fcf22..563c7ef6b 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -151,6 +151,27 @@ static int property_get_idle_since_hint(
         return sd_bus_message_append(reply, "t", k);
 }
 
+static int property_get_linger(
+                sd_bus *bus,
+                const char *path,
+                const char *interface,
+                const char *property,
+                sd_bus_message *reply,
+                sd_bus_error *error,
+                void *userdata) {
+
+        User *u = userdata;
+        int r;
+
+        assert(bus);
+        assert(reply);
+        assert(u);
+
+        r = user_check_linger_file(u);
+
+        return sd_bus_message_append(reply, "b", r > 0);
+}
+
 static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata) {
         User *u = userdata;
         int r;
@@ -206,6 +227,7 @@ const sd_bus_vtable user_vtable[] = {
         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, method_terminate, 0),
         SD_BUS_METHOD("Kill", "i", NULL, method_kill, 0),
@@ -214,11 +236,7 @@ const sd_bus_vtable user_vtable[] = {
 };
 
 int user_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata) {
-
-        _cleanup_free_ char *e = NULL;
         Manager *m = userdata;
-        unsigned long lu;
-        const char *p;
         User *user;
         int r;
 
@@ -228,17 +246,37 @@ int user_object_find(sd_bus *bus, const char *path, const char *interface, void
         assert(found);
         assert(m);
 
-        p = startswith(path, "/org/freedesktop/login1/user/_");
-        if (!p)
-                return 0;
+        if (streq(path, "/org/freedesktop/login1/user/self")) {
+                sd_bus_message *message;
+                pid_t pid;
 
-        r = safe_atolu(p, &lu);
-        if (r < 0)
-                return 0;
+                message = sd_bus_get_current(bus);
+                if (!message)
+                        return 0;
 
-        user = hashmap_get(m->users, ULONG_TO_PTR(lu));
-        if (!user)
-                return 0;
+                r = sd_bus_get_owner_pid(bus, sd_bus_message_get_sender(message), &pid);
+                if (r < 0)
+                        return 0;
+
+                r = manager_get_user_by_pid(m, pid, &user);
+                if (r <= 0)
+                        return 0;
+        } 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;
+        }
 
         *found = user;
         return 1;