xserver: Branch 'master'

[Jeremy Huddleston]

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

New commits:
commit e917806fc556c2054b2835c8f85770b554c78092
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Nov 14 10:56:21 2008 -0800

    os/connection: TRANS_NOXAUTH bit comparison brainfart fix.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=18524

diff --git a/os/connection.c b/os/connection.c
index 64b0a0b..ddb2d6c 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -665,7 +665,7 @@ ClientAuthorized(ClientPtr client,
 
     /* Allow any client to connect without authorization on a launchd socket,
        because it is securely created -- this prevents a race condition on launch */
-    if(trans_conn->flags | TRANS_NOXAUTH) {
+    if(trans_conn->flags & TRANS_NOXAUTH) {
         auth_id = (XID) 0L;
     } else {
         auth_id = CheckAuthorization (proto_n, auth_proto, string_n, auth_string, client, &reason);