From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Feb 2023 17:27:43 +0000 (+0100)
Subject: shared: move cg_set_access() declaration to right header file
X-Git-Tag: v254-rc1~1167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dafb406383610cc631345815919fd8a77ee0c4dc;p=thirdparty%2Fsystemd.git

shared: move cg_set_access() declaration to right header file

This function was moved from cgroup-util.c to cgroup-setup.c a while
back, but the prototype in the matching header files wasn't migrated.
Let's fix that.
---

diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index b69f1683dbe..5de000c4ceb 100644
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -239,7 +239,6 @@ int cg_get_attribute_as_uint64(const char *controller, const char *path, const c
 /* Does a parse_boolean() on the attribute contents and sets ret accordingly */
 int cg_get_attribute_as_bool(const char *controller, const char *path, const char *attribute, bool *ret);
 
-int cg_set_access(const char *controller, const char *path, uid_t uid, gid_t gid);
 int cg_get_owner(const char *controller, const char *path, uid_t *ret_uid);
 
 int cg_set_xattr(const char *controller, const char *path, const char *name, const void *value, size_t size, int flags);
diff --git a/src/core/scope.c b/src/core/scope.c
index 62f23a9e1ec..510bb28c937 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -4,6 +4,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
+#include "cgroup-setup.h"
 #include "dbus-scope.h"
 #include "dbus-unit.h"
 #include "exit-status.h"
diff --git a/src/shared/cgroup-setup.h b/src/shared/cgroup-setup.h
index 95a515339d6..13f836bd90a 100644
--- a/src/shared/cgroup-setup.h
+++ b/src/shared/cgroup-setup.h
@@ -23,6 +23,8 @@ int cg_attach(const char *controller, const char *path, pid_t pid);
 int cg_attach_fallback(const char *controller, const char *path, pid_t pid);
 int cg_create_and_attach(const char *controller, const char *path, pid_t pid);
 
+int cg_set_access(const char *controller, const char *path, uid_t uid, gid_t gid);
+
 int cg_migrate(const char *cfrom, const char *pfrom, const char *cto, const char *pto, CGroupFlags flags);
 int cg_migrate_recursive(const char *cfrom, const char *pfrom, const char *cto, const char *pto, CGroupFlags flags);
 int cg_migrate_recursive_fallback(const char *cfrom, const char *pfrom, const char *cto, const char *pto, CGroupFlags flags);