From bc727e7ef188a6f103f1a5cc201090f831cd9b03 Mon Sep 17 00:00:00 2001 From: Henrik Andersson Date: Tue, 29 Jan 2019 10:28:14 +0100 Subject: [PATCH] One should be able to provide empty password via -p --- rdesktop.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rdesktop.c b/rdesktop.c index 5c62b1b..010ddb6 100644 --- a/rdesktop.c +++ b/rdesktop.c @@ -159,6 +159,8 @@ extern RDPDR_DEVICE g_rdpdr_device[]; extern uint32 g_num_devices; extern char *g_rdpdr_clientname; +RD_BOOL password_provided = False; + /* Display usage information */ static void usage(char *program) @@ -857,6 +859,7 @@ main(int argc, char *argv[]) case 'p': if (!((optarg[0] == '-') && (optarg[1] == 0))) { + password_provided = True; STRNCPY(g_password, optarg, sizeof(g_password)); flags |= RDP_INFO_AUTOLOGON; @@ -1282,7 +1285,7 @@ main(int argc, char *argv[]) xfree(locale); /* If no password provided at this point, prompt for password / pin */ - if (!g_password[0]) + if (!g_password[0] && password_provided == False) { if (read_password(g_password, sizeof(g_password))) {