xserver: Branch 'server-1.4-branch'

[Eamon Walsh]

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

New commits:
commit 74b40bba327a2e97780e8e3f995f784add2d6231
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Thu Feb 14 19:47:44 2008 -0500

    security: Fix for Bug #14480: untrusted access broken in 7.3.

diff --git a/Xext/security.c b/Xext/security.c
index e9d48c9..14ad354 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1014,7 +1014,7 @@ CALLBACK(SecurityCheckResourceIDAccess)
     }
     else /* server-owned resource - probably a default colormap or root window */
     {
-	if (RT_WINDOW == rtype || RC_DRAWABLE == rtype)
+	if (RC_DRAWABLE & rtype)
 	{
 	    switch (reqtype)
 	    {   /* the following operations are allowed on root windows */