--- sourceforge.net/trunk/rdesktop/secure.c	2003/08/01 17:01:58	438
+++ sourceforge.net/trunk/rdesktop/secure.c	2003/10/31 20:34:26	540
@@ -34,12 +34,13 @@
 #endif
 
 extern char hostname[16];
-extern int width;
-extern int height;
+extern int g_width;
+extern int g_height;
 extern int keylayout;
 extern BOOL g_encryption;
 extern BOOL g_licence_issued;
 extern BOOL g_use_rdp5;
+extern BOOL g_console_session;
 extern int g_server_bpp;
 extern uint16 mcs_userid;
 extern VCHANNEL g_channels[];
@@ -432,8 +433,8 @@
 	out_uint16_le(s, 212);	/* length */
 	out_uint16_le(s, g_use_rdp5 ? 4 : 1);	/* RDP version. 1 == RDP4, 4 == RDP5. */
 	out_uint16_le(s, 8);
-	out_uint16_le(s, width);
-	out_uint16_le(s, height);
+	out_uint16_le(s, g_width);
+	out_uint16_le(s, g_height);
 	out_uint16_le(s, 0xca01);
 	out_uint16_le(s, 0xaa03);
 	out_uint32_le(s, keylayout);
@@ -474,7 +475,7 @@
 
 	out_uint16_le(s, SEC_TAG_CLI_4);
 	out_uint16_le(s, 12);
-	out_uint32_le(s, 9);
+	out_uint32_le(s, g_console_session ? 0xb : 9);
 	out_uint32(s, 0);
 
 	/* Client encryption settings */
@@ -699,7 +700,7 @@
 
 	DEBUG(("Generating client random\n"));
 	/* Generate a client random, and hence determine encryption keys */
-	// This is what the MS client do:
+	/* This is what the MS client do: */
 	memset(inr, 0, SEC_RANDOM_SIZE);
 	/*  *ARIGL!* Plaintext attack, anyone?
 	   I tried doing:
@@ -843,7 +844,7 @@
 	if (!mcs_connect(server, &mcs_data, username))
 		return False;
 
-	//      sec_process_mcs_data(&mcs_data);
+	/*      sec_process_mcs_data(&mcs_data); */
 	if (g_encryption)
 		sec_establish_key();
 	xfree(mcs_data.data);