xserver: Branch 'master'

[Eamon Walsh]

 Xext/security.c |    1 +
 1 files changed, 1 insertion(+)

New commits:
diff-tree c2f3f705f1db8ca78292912544a7e416116175f3 (from 811675733e97416c990e6dc9c19271b43d96248d)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Thu Feb 15 14:38:24 2007 -0500

    Bug #6988: Change behavior of Security extension per user feature request.

diff --git a/Xext/security.c b/Xext/security.c
index bd397a9..7202d39 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1187,6 +1187,7 @@ CALLBACK(SecurityCheckMapAccess)
     if (STATEPTR(rec->client) &&
 	(TRUSTLEVEL(rec->client) != XSecurityClientTrusted) &&
 	(pWin->drawable.class == InputOnly) &&
+	pWin->parent && pWin->parent->parent &&
 	(TRUSTLEVEL(wClient(pWin->parent)) == XSecurityClientTrusted))
 
 	rec->rval = FALSE;