diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-14 08:39:30 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-14 08:39:30 +0000 |
| commit | 898081f31f99dc35a1602a607a07d1aaff49ac40 (patch) | |
| tree | b2adbc0fd699cc5dc2af141df26130e7874f9369 /xorg-server/os/connection.c | |
| parent | c1e91b66cbcf91645f65b9d63f115dcb5a441406 (diff) | |
| parent | 019fc27ce6dc2a1809107be10d4deb80e0fa436b (diff) | |
| download | vcxsrv-898081f31f99dc35a1602a607a07d1aaff49ac40.tar.gz vcxsrv-898081f31f99dc35a1602a607a07d1aaff49ac40.tar.bz2 vcxsrv-898081f31f99dc35a1602a607a07d1aaff49ac40.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/os/connection.c')
| -rw-r--r-- | xorg-server/os/connection.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c index da195df39..6e6f9fc33 100644 --- a/xorg-server/os/connection.c +++ b/xorg-server/os/connection.c @@ -881,15 +881,14 @@ EstablishNewConnections(ClientPtr clientUnused, pointer closure) _XSERVTransSetOption(new_trans_conn, TRANS_NONBLOCKING, 1);
+ if(trans_conn->flags & TRANS_NOXAUTH)
+ new_trans_conn->flags = new_trans_conn->flags | TRANS_NOXAUTH;
+
if (!AllocNewConnection (new_trans_conn, newconn, connect_time))
{
ErrorConnMax(new_trans_conn);
_XSERVTransClose(new_trans_conn);
}
-
- if(trans_conn->flags & TRANS_NOXAUTH)
- new_trans_conn->flags = new_trans_conn->flags | TRANS_NOXAUTH;
-
}
#ifndef WIN32
}
|