Revert "dix: Extend initial connection handshake for forwarding proxies"

This reverts commit 78fa121f4097d29458e5453c13473595df06e26e.

ABI change pended for 1.13

1 files changed, 3 insertions, 9 deletions

diff --git a/dix/dispatch.c b/dix/dispatch.c
index b91b41f4a..44c24337a 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3582,14 +3582,12 @@ ProcInitialConnection(ClientPtr client)
     REQUEST(xReq);
     xConnClientPrefix *prefix;
     int whichbyte = 1;
-    char order;
 
     prefix = (xConnClientPrefix *)((char *)stuff + sz_xReq);
-    order = prefix->byteOrder;
-    if (order != 'l' && order != 'B' && order != 'r' && order != 'R')
+    if ((prefix->byteOrder != 'l') && (prefix->byteOrder != 'B'))
 	return client->noClientException = -1;
-    if (((*(char *) &whichbyte) && (order == 'B' || order == 'R')) ||
-	(!(*(char *) &whichbyte) && (order == 'l' || order == 'r')))
+    if (((*(char *) &whichbyte) && (prefix->byteOrder == 'B')) ||
+	(!(*(char *) &whichbyte) && (prefix->byteOrder == 'l')))
     {
 	client->swapped = TRUE;
 	SwapConnClientPrefix(prefix);
@@ -3601,10 +3599,6 @@ ProcInitialConnection(ClientPtr client)
     {
 	swaps(&stuff->length);
     }
-    if (order == 'r' || order == 'R')
-    {
-	client->local = FALSE;
-    }
     ResetCurrentRequest(client);
     return Success;
 }