From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 2 Jul 2013 01:58:28 +0000 (+0200)
Subject: machined: fix bus path unescaping
X-Git-Tag: v205~30
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=51da82a781537b275db3fbce8fab8592dd991758

machined: fix bus path unescaping
---

diff --git a/TODO b/TODO
index 96ed2c06d..00f22d592 100644
--- a/TODO
+++ b/TODO
@@ -64,11 +64,6 @@ Features:
 
 * handle jointly mounted controllers correctly
 
-* split out CreateMachine into systemd-machined
-
-* make logind's session and machine
-  registration use Slices to set up cgroups
-
 * journald: make sure ratelimit is actually really per-service with the new cgroup changes
 
 * move systemctl dump to systemd-analyze
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 424f98edd..243b8604c 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -109,7 +109,7 @@ static int get_machine_for_path(Manager *m, const char *path, Machine **_machine
         if (!startswith(path, "/org/freedesktop/machine1/machine/"))
                 return -EINVAL;
 
-        e = bus_path_unescape(path + 32);
+        e = bus_path_unescape(path + 34);
         if (!e)
                 return -ENOMEM;