From a90ee792d96752ad1b71b9ada922fa6afe478c99 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Sun, 5 Dec 2010 15:36:12 +0000
Subject: Upgrade to xorg-server 1.9.2. Tested by ajacoutot@, krw@, shadchin@
 and jasper@ on various configurations including multihead with both zaphod
 and xrandr.

---
 xserver/Xext/xselinuxint.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'xserver/Xext/xselinuxint.h')

diff --git a/xserver/Xext/xselinuxint.h b/xserver/Xext/xselinuxint.h
index 854a57dd7..011a10370 100644
--- a/xserver/Xext/xselinuxint.h
+++ b/xserver/Xext/xselinuxint.h
@@ -36,6 +36,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * Types
  */
 
+#define COMMAND_LEN 64
+
 /* subject state (clients and devices only) */
 typedef struct {
     security_id_t sid;
@@ -46,7 +48,7 @@ typedef struct {
     security_id_t sel_use_sid;
     security_id_t prp_use_sid;
     struct avc_entry_ref aeref;
-    char *command;
+    char command[COMMAND_LEN];
     int privileged;
 } SELinuxSubjectRec;
 
@@ -60,9 +62,12 @@ typedef struct {
  * Globals
  */
 
-extern DevPrivateKey subjectKey;
-extern DevPrivateKey objectKey;
-extern DevPrivateKey dataKey;
+extern DevPrivateKeyRec subjectKeyRec;
+#define subjectKey (&subjectKeyRec)
+extern DevPrivateKeyRec objectKeyRec;
+#define objectKey (&objectKeyRec)
+extern DevPrivateKeyRec dataKeyRec;
+#define dataKey (&dataKeyRec)
 
 /*
  * Label functions
-- 
cgit v1.2.3