diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-02-26 19:55:15 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-03-25 19:40:04 +0000 |
| commit | 537293ff4ec2075efdfb69af8b7ce630e17ce88e (patch) | |
| tree | 09ac4dd59a5625bae90f118f31f76130cef27e4b | |
| parent | bb2e2eba422128d06666afa7dedd45f08a78f02e (diff) | |
os: move SELinux enforcement state to the extension
Those fields are better off in the extension instead of the OS layer.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1328>
| -rw-r--r-- | Xext/xselinux_ext.c | 3 | ||||
| -rw-r--r-- | os/utils.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c index 99501eeef..321620c11 100644 --- a/Xext/xselinux_ext.c +++ b/Xext/xselinux_ext.c @@ -44,6 +44,9 @@ typedef struct { CARD32 id; } SELinuxListItemRec; +Bool noSELinuxExtension = FALSE; +int selinuxEnforcingState = SELINUX_MODE_DEFAULT; + /* * Extension Dispatch */ diff --git a/os/utils.c b/os/utils.c index 9173fcbf2..df56b5b9b 100644 --- a/os/utils.c +++ b/os/utils.c @@ -168,10 +168,6 @@ Bool noXFixesExtension = FALSE; /* Xinerama is disabled by default unless enabled via +xinerama */ Bool noPanoramiXExtension = TRUE; #endif -#ifdef XSELINUX -Bool noSELinuxExtension = FALSE; -int selinuxEnforcingState = SELINUX_MODE_DEFAULT; -#endif #ifdef XV Bool noXvExtension = FALSE; #endif |