xserver: Branch 'master'

[Keith Packard]

 os/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d0da0e9c3bb8fe0cd4879ecb24d21715bfaa209b
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Sep 4 10:59:40 2014 -0700

    glx: Disable indirect GLX contexts by default.
    
    Almost every situation of someone running indirect GLX is a mistake
    that results in X Server crashes.  Indirect GLX is the cause of
    regular security vulnerabilities, and rarely provides any capability
    to the user.  Just disable it unless someone wants to enable it for
    their special use case (using +iglx on the command line).
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Acked-by:  Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/os/utils.c b/os/utils.c
index f319743..c83f77d 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -194,7 +194,7 @@ Bool noGEExtension = FALSE;
 
 Bool CoreDump;
 
-Bool enableIndirectGLX = TRUE;
+Bool enableIndirectGLX = FALSE;
 
 #ifdef PANORAMIX
 Bool PanoramiXExtensionDisabledHack = FALSE;