summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Sekletár <msekleta@redhat.com>2020-04-03 09:13:59 +0200
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>2020-06-23 14:50:50 +0200
commit7301b170b266225f091e95ff52b3a95ff9776d13 (patch)
treeb8de0a281af479ef32139468cfbeeaf23428f06d
parent41346615264e01c6ff6118e09cf3ac4b4c71e89d (diff)
downloadsystemd-7301b170b266225f091e95ff52b3a95ff9776d13.tar.gz
selinux: do preprocessor check only in selinux-access.c
This has the advantage that mac_selinux_access_check() can be used as a function in all contexts. For example, parameters passed to it won't be reported as unused if the "function" call is replaced with 0 on SELinux disabled builds. (cherry picked from commit 08deac6e3e9119aeb966375f94695e4aa14ffb1c) Related: #1830861
-rw-r--r--src/core/selinux-access.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h
index 59f2e60c77..46a657a4b4 100644
--- a/src/core/selinux-access.h
+++ b/src/core/selinux-access.h
@@ -12,17 +12,8 @@
int mac_selinux_generic_access_check(sd_bus_message *message, const char *path, const char *permission, sd_bus_error *error);
-#if HAVE_SELINUX
-
#define mac_selinux_access_check(message, permission, error) \
mac_selinux_generic_access_check((message), NULL, (permission), (error))
#define mac_selinux_unit_access_check(unit, message, permission, error) \
mac_selinux_generic_access_check((message), unit_label_path(unit), (permission), (error))
-
-#else
-
-#define mac_selinux_access_check(message, permission, error) 0
-#define mac_selinux_unit_access_check(unit, message, permission, error) 0
-
-#endif