xserver: Branch 'master'

[Adam Jackson]

 Xext/security.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4583fa9a6cd3095d7497c075d68e7430ea3c5cb0
Author: Ángel González <ingenit at zoho.com>
Date:   Mon Oct 15 22:04:22 2012 +0200

    security: Fix reversed comment
    
    Commit 6045506be0cebca4ebbe943ae77f020aafa703d4 changed back
    the behavior to only allow the trusted extensions to the untrusted clients,
    but left the 8b5d21cc1d1f4e9d20e5d5eca44cb1e60a419763
    comment intended for Security*Un*trustedExtensions saying that
    "untrusted clients shouldn't have access to these".
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Ángel González <ingenit at zoho.com>

diff --git a/Xext/security.c b/Xext/security.c
index 04382ff..8cb3a2c 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -63,7 +63,7 @@ typedef struct {
     XID authId;
 } SecurityStateRec;
 
-/* Extensions that untrusted clients shouldn't have access to */
+/* The only extensions that untrusted clients have access to */
 static const char *SecurityTrustedExtensions[] = {
     "XC-MISC",
     "BIG-REQUESTS",