--- sourceforge.net/trunk/rdesktop/secure.c	2004/06/01 08:06:02	706
+++ sourceforge.net/trunk/rdesktop/secure.c	2004/06/15 22:17:08	710
@@ -33,10 +33,10 @@
 #include "crypto/bn.h"
 #endif
 
-extern char hostname[16];
+extern char g_hostname[16];
 extern int g_width;
 extern int g_height;
-extern int keylayout;
+extern int g_keylayout;
 extern BOOL g_encryption;
 extern BOOL g_licence_issued;
 extern BOOL g_use_rdp5;
@@ -410,7 +410,7 @@
 static void
 sec_out_mcs_data(STREAM s)
 {
-	int hostlen = 2 * strlen(hostname);
+	int hostlen = 2 * strlen(g_hostname);
 	int length = 158 + 76 + 12 + 4;
 	unsigned int i;
 
@@ -446,11 +446,11 @@
 	out_uint16_le(s, g_height);
 	out_uint16_le(s, 0xca01);
 	out_uint16_le(s, 0xaa03);
-	out_uint32_le(s, keylayout);
+	out_uint32_le(s, g_keylayout);
 	out_uint32_le(s, 2600);	/* Client build. We are now 2600 compatible :-) */
 
 	/* Unicode name of client, padded to 32 bytes */
-	rdp_out_unistr(s, hostname, hostlen);
+	rdp_out_unistr(s, g_hostname, hostlen);
 	out_uint8s(s, 30 - hostlen);
 
 	out_uint32_le(s, 4);