xserver: Branch 'master'

[Eamon Walsh]

 Xext/xselinux.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 79dd600942bbac3c6b531f284b42c7b2c822da90
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Tue Jun 17 19:09:44 2008 -0400

    SELinux: Add an extension alias under the OS-agnostic "Flask" name.

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 1e3b4d6..a47df03 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -2031,6 +2031,8 @@ SELinuxExtensionInit(INITARGS)
 			    ProcSELinuxDispatch, SProcSELinuxDispatch,
 			    SELinuxResetProc, StandardMinorOpcode);
 
+    AddExtensionAlias("Flask", extEntry);
+
     /* Label objects that were created before we could register ourself */
     SELinuxLabelInitial();
 }