xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

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

New commits:
commit 3ec234976079d30f10e5246f6847a7eee01c144e
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Aug 6 10:06:09 2008 -0700

    Fixed bitwise or-and typo in my last commit.

diff --git a/os/connection.c b/os/connection.c
index 4d4a623..21e6b0d 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -669,7 +669,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);