X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-session-dbus.c;h=c3d4d60158f274c3b221086a917989fdc0f9d80b;hb=236af516b866473c22f980b556a2d7535cef4d9b;hp=f9305ddbee63c04147b98711e97eb6157d04ab7b;hpb=9bb69af4f2823fdd30902f5ffd959e9b041feb53;p=elogind.git diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index f9305ddbe..c3d4d6015 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -558,11 +558,9 @@ int session_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; - } } *nodes = l; @@ -677,9 +675,11 @@ int session_send_create_reply(Session *s, sd_bus_error *error) { return -ENOMEM; log_debug("Sending reply about created session: " - "id=%s object_path=%s runtime_path=%s session_fd=%d seat=%s vtnr=%u", + "id=%s object_path=%s uid=%u runtime_path=%s " + "session_fd=%d seat=%s vtnr=%u", s->id, p, + (uint32_t) s->user->uid, s->user->runtime_path, fifo_fd, s->seat ? s->seat->id : "",