xserver: Branch 'master'

[Eamon Walsh]

 dix/protocol.txt |   28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

New commits:
commit 656d3d7623c6b83024e9cdc60d1257f4d87aa268
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Tue Jun 17 17:55:11 2008 -0400

    SELinux: Bring server-side name registry up to date.

diff --git a/dix/protocol.txt b/dix/protocol.txt
index f4cdf7b..0a85ca8 100644
--- a/dix/protocol.txt
+++ b/dix/protocol.txt
@@ -359,16 +359,28 @@ V000 SECURITY:AuthorizationRevoked
 E000 SECURITY:BadAuthorization
 E001 SECURITY:BadAuthorizationProtocol
 R000 SELinux:SELinuxQueryVersion
-R001 SELinux:SELinuxSetSelectionManager
-R002 SELinux:SELinuxGetSelectionManager
+R001 SELinux:SELinuxSetDeviceCreateContext
+R002 SELinux:SELinuxGetDeviceCreateContext
 R003 SELinux:SELinuxSetDeviceContext
 R004 SELinux:SELinuxGetDeviceContext
-R005 SELinux:SELinuxSetPropertyCreateContext
-R006 SELinux:SELinuxGetPropertyCreateContext
-R007 SELinux:SELinuxGetPropertyContext
-R008 SELinux:SELinuxSetWindowCreateContext
-R009 SELinux:SELinuxGetWindowCreateContext
-R010 SELinux:SELinuxGetWindowContext
+R005 SELinux:SELinuxSetWindowCreateContext
+R006 SELinux:SELinuxGetWindowCreateContext
+R007 SELinux:SELinuxGetWindowContext
+R008 SELinux:SELinuxSetPropertyCreateContext
+R009 SELinux:SELinuxGetPropertyCreateContext
+R010 SELinux:SELinuxSetPropertyUseContext
+R011 SELinux:SELinuxGetPropertyUseContext
+R012 SELinux:SELinuxGetPropertyContext
+R013 SELinux:SELinuxGetPropertyDataContext
+R014 SELinux:SELinuxListProperties
+R015 SELinux:SELinuxSetSelectionCreateContext
+R016 SELinux:SELinuxGetSelectionCreateContext
+R017 SELinux:SELinuxSetSelectionUseContext
+R018 SELinux:SELinuxGetSelectionUseContext
+R019 SELinux:SELinuxGetSelectionContext
+R020 SELinux:SELinuxGetSelectionDataContext
+R021 SELinux:SELinuxListSelections
+R022 SELinux:SELinuxGetClientContext
 R000 SHAPE:QueryVersion
 R001 SHAPE:Rectangles
 R002 SHAPE:Mask