--- sourceforge.net/trunk/rdesktop/rdesktop.c	2003/09/02 09:32:13	458
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2003/10/06 09:37:24	479
@@ -40,8 +40,8 @@
 #include "crypto/md5.h"
 #endif
 
-char g_title[32] = "";
-char g_username[16];
+char g_title[64] = "";
+char g_username[64];
 char hostname[16];
 char keymapname[16];
 int keylayout = 0x409;		/* Defaults to US keyboard layout */
@@ -81,7 +81,7 @@
 	fprintf(stderr, "Usage: %s [options] server[:port]\n", program);
 #ifdef RDP2VNC
 	fprintf(stderr, "   -V: vnc port\n");
-	fprintf(stderr, "   -E: defer time (ms)\n");
+	fprintf(stderr, "   -Q: defer time (ms)\n");
 #endif
 	fprintf(stderr, "   -u: user name\n");
 	fprintf(stderr, "   -d: domain\n");
@@ -95,7 +95,7 @@
 	fprintf(stderr, "   -f: full-screen mode\n");
 	fprintf(stderr, "   -b: force bitmap updates\n");
 	fprintf(stderr, "   -e: disable encryption (French TS)\n");
-	fprintf(stderr, "   -E: disable encryption of everything but the logon packet\n");
+	fprintf(stderr, "   -E: disable encryption from client to server\n");
 	fprintf(stderr, "   -m: do not send motion events\n");
 	fprintf(stderr, "   -C: use private colour map\n");
 	fprintf(stderr, "   -K: keep window manager key bindings\n");
@@ -197,7 +197,7 @@
 	char server[64];
 	char fullhostname[64];
 	char domain[16];
-	char password[16];
+	char password[64];
 	char shell[128];
 	char directory[32];
 	BOOL prompt_password, rdp_retval = False;
@@ -213,7 +213,7 @@
 	strcpy(keymapname, "en-us");
 
 #ifdef RDP2VNC
-#define VNCOPT "V:E:"
+#define VNCOPT "V:Q:"
 #else
 #define VNCOPT
 #endif
@@ -229,7 +229,7 @@
 					rfb_port += 5900;
 				break;
 
-			case 'E':
+			case 'Q':
 				defer_time = strtol(optarg, NULL, 10);
 				if (defer_time < 0)
 					defer_time = 0;
@@ -425,7 +425,9 @@
 	if (!ui_init())
 		return 1;
 
-	/* rdpsnd_init(); */
+#ifdef WITH_RDPSND
+	rdpsnd_init();
+#endif
 	/* rdpdr_init(); */
 
 	if (!rdp_connect(server, flags, domain, password, shell, directory))