From: Michal Sekletár <msekleta@redhat.com>
Date: Fri, 3 Apr 2020 07:13:59 +0000 (+0200)
Subject: selinux: do preprocessor check only in selinux-access.c
X-Git-Tag: v246-rc1~465^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08deac6e3e9119aeb966375f94695e4aa14ffb1c;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h
index da2e6cbd740..58f737de097 100644
--- a/src/core/selinux-access.h
+++ b/src/core/selinux-access.h
@@ -7,17 +7,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