Merge remote-tracking branch 'origin/released'

* origin/released:
  pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012

Conflicts:
	xorg-server/Xext/xf86bigfont.c
	xorg-server/dix/dispatch.c
	xorg-server/include/dixstruct.h
	xorg-server/os/connection.c

1 files changed, 12 insertions, 7 deletions

diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index 1221f044d..5c17d3750 100644
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -3542,14 +3542,16 @@ ProcInitialConnection(ClientPtr client)
     REQUEST(xReq);

     xConnClientPrefix *prefix;

     int whichbyte = 1;

+    char order;

 

-    prefix = (xConnClientPrefix *) ((char *) stuff + sz_xReq);

-    if ((prefix->byteOrder != 'l') && (prefix->byteOrder != 'B'))

-        return client->noClientException = -1;

-    if (((*(char *) &whichbyte) && (prefix->byteOrder == 'B')) ||

-        (!(*(char *) &whichbyte) && (prefix->byteOrder == 'l'))) {

-        client->swapped = TRUE;

-        SwapConnClientPrefix(prefix);

+    prefix = (xConnClientPrefix *) ((char *)stuff + sz_xReq);

+    order = prefix->byteOrder;

+    if (order != 'l' && order != 'B' && order != 'r' && order != 'R')

+	return client->noClientException = -1;

+    if (((*(char *) &whichbyte) && (order == 'B' || order == 'R')) ||

+	(!(*(char *) &whichbyte) && (order == 'l' || order == 'r'))) {

+	client->swapped = TRUE;

+	SwapConnClientPrefix(prefix);

     }

     stuff->reqType = 2;

     stuff->length += bytes_to_int32(prefix->nbytesAuthProto) +

@@ -3557,6 +3559,9 @@ ProcInitialConnection(ClientPtr client)
     if (client->swapped) {

         swaps(&stuff->length);

     }

+    if (order == 'r' || order == 'R') {

+	client->local = FALSE;

+    }

     ResetCurrentRequest(client);

     return Success;

 }