From: Christian Göttsche <cgzones@googlemail.com>
Date: Wed, 28 Jul 2021 15:00:02 +0000 (+0200)
Subject: selinux: name mac_selinux_generic_access_check as internal function
X-Git-Tag: v250-rc1~199
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=963438a0278ea7971a44d5c962829b4d4457701f;p=thirdparty%2Fsystemd.git

selinux: name mac_selinux_generic_access_check as internal function

`mac_selinux_generic_access_check()` should not be called directly, only
via the wrapper macros `mac_selinux_access_check` and
`mac_selinux_unit_access_check`.
---

diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index 6afc64a7b16..ad098e99dfa 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -177,7 +177,7 @@ static int access_init(sd_bus_error *error) {
    If the machine is in permissive mode it will return ok.  Audit messages will
    still be generated if the access would be denied in enforcing mode.
 */
-int mac_selinux_generic_access_check(
+int mac_selinux_access_check_internal(
                 sd_bus_message *message,
                 const char *path,
                 const char *permission,
@@ -286,7 +286,7 @@ int mac_selinux_generic_access_check(
 
 #else /* HAVE_SELINUX */
 
-int mac_selinux_generic_access_check(
+int mac_selinux_access_check_internal(
                 sd_bus_message *message,
                 const char *path,
                 const char *permission,
diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h
index 93aedc2347e..e5ebcb13a20 100644
--- a/src/core/selinux-access.h
+++ b/src/core/selinux-access.h
@@ -5,14 +5,14 @@
 
 #include "manager.h"
 
-int mac_selinux_generic_access_check(sd_bus_message *message,
-                                     const char *path,
-                                     const char *permission,
-                                     const char *function,
-                                     sd_bus_error *error);
+int mac_selinux_access_check_internal(sd_bus_message *message,
+                                      const char *path,
+                                      const char *permission,
+                                      const char *function,
+                                      sd_bus_error *error);
 
 #define mac_selinux_access_check(message, permission, error) \
-        mac_selinux_generic_access_check((message), NULL, (permission), __func__, (error))
+        mac_selinux_access_check_internal((message), NULL, (permission), __func__, (error))
 
 #define mac_selinux_unit_access_check(unit, message, permission, error) \
-        mac_selinux_generic_access_check((message), unit_label_path(unit), (permission), __func__, (error))
+        mac_selinux_access_check_internal((message), unit_label_path(unit), (permission), __func__, (error))