From 320814811417146cfa1e416f69f1101eed630c36 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 3 Feb 2015 20:07:37 -0500 Subject: cg_path_get_user_unit(): Did not correctly parse user-unit templates. It ran either skip_session() or skip_user_manager(), then ran skip_slices() iff skip_session() ran. It needs to run skip_slices() in either case. Included is a test case demonstrating why. --- src/test/test-cgroup-util.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/test/test-cgroup-util.c') diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c index 58eb744277..67eeeb56b7 100644 --- a/src/test/test-cgroup-util.c +++ b/src/test/test-cgroup-util.c @@ -93,6 +93,7 @@ static void test_path_get_user_unit(void) { check_p_g_u_u("/meh.service", -ENOENT, NULL); check_p_g_u_u("/session-3.scope/_cpu.service", 0, "cpu.service"); check_p_g_u_u("/user.slice/user-1000.slice/user@1000.service/server.service", 0, "server.service"); + check_p_g_u_u("/user.slice/user-1000.slice/user@1000.service/foobar.slice/foobar@pie.service", 0, "foobar@pie.service"); check_p_g_u_u("/user.slice/user-1000.slice/user@.service/server.service", -ENOENT, NULL); } -- cgit v1.2.3-54-g00ecf