diff options
author | Sven Eden <yamakuzure@gmx.net> | 2018-06-11 17:49:21 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2018-06-11 17:49:57 +0200 |
commit | c89778187e749926b62b76095c277c4861f907d4 (patch) | |
tree | 714ade1231a2064f84c8ce8c89550daafc058a47 /src/basic/cgroup-util.c | |
parent | 0f50f4ce724cc1131e9e0c7dffe02b07d2279101 (diff) |
Prep v238: Fix cg_path_decode_unit() to understand elogind session naming.
(cherry picked from commit d8949c3072a4b984d6fa964178a2d8d945ecbcb6)
Diffstat (limited to 'src/basic/cgroup-util.c')
-rw-r--r-- | src/basic/cgroup-util.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 6364a930a..8322f4077 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -1476,15 +1476,21 @@ int cg_path_decode_unit(const char *cgroup, char **unit) { assert(cgroup); assert(unit); +#if 0 /// elogind has a different naming: <controller>:/<session id>. So prefix is always len < 3 n = strcspn(cgroup, "/"); if (n < 3) return -ENXIO; +#else + n = strspn(cgroup, "/") + 1; +#endif // 0 c = strndupa(cgroup, n); c = cg_unescape(c); +#if 0 /// elogind session ids are never valid unit names. if (!unit_name_is_valid(c, UNIT_NAME_PLAIN|UNIT_NAME_INSTANCE)) return -ENXIO; +#endif // 0 s = strdup(c); if (!s) |