xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 Xext/xselinux.h     |    8 ++++++++
 Xext/xselinux_ext.c |    3 +++
 include/globals.h   |    8 --------
 os/utils.c          |    4 ----
 4 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit a57b449485912f908608b6af2ff0ac1342dec087
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Feb 26 20:04:56 2024 +0100

    include: unpexport SELINUX_* consts from include/global.h
    
    globals.h shouldn't be cluttered with extension specific things, that
    aren't even used by external modules/drivers.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1328>

diff --git a/Xext/xselinux.h b/Xext/xselinux.h
index 5be7088c8..52e720fd7 100644
--- a/Xext/xselinux.h
+++ b/Xext/xselinux.h
@@ -136,4 +136,12 @@ typedef struct {
     CARD32 pad6;
 } SELinuxListItemsReply;
 
+#ifdef XSELINUX
+#define SELINUX_MODE_DEFAULT    0
+#define SELINUX_MODE_DISABLED   1
+#define SELINUX_MODE_PERMISSIVE 2
+#define SELINUX_MODE_ENFORCING  3
+extern int selinuxEnforcingState;
+#endif
+
 #endif                          /* _XSELINUX_H */
diff --git a/include/globals.h b/include/globals.h
index 341ce832c..887e788c8 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -34,12 +34,4 @@ extern _X_EXPORT sig_atomic_t inSignalContext;
 extern _X_EXPORT Bool PanoramiXExtensionDisabledHack;
 #endif
 
-#ifdef XSELINUX
-#define SELINUX_MODE_DEFAULT    0
-#define SELINUX_MODE_DISABLED   1
-#define SELINUX_MODE_PERMISSIVE 2
-#define SELINUX_MODE_ENFORCING  3
-extern _X_EXPORT int selinuxEnforcingState;
-#endif
-
 #endif                          /* !_XSERV_GLOBAL_H_ */
commit 537293ff4ec2075efdfb69af8b7ce630e17ce88e
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Feb 26 19:55:15 2024 +0100

    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 at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1328>

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