From d33c7b4d7affd90834baa981fc6f6454f6542882 Mon Sep 17 00:00:00 2001 From: Fabian Ruff Date: Mon, 27 Oct 2014 18:21:02 +0100 Subject: [PATCH 1/2] Add password to rdp_info hash Any specific reason the password was omitted from the rdp_info hash? Without the password in the rdp_info hash I see no way of figuring out the password in the rdp_client capability. --- plugins/commands/rdp/command.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/commands/rdp/command.rb b/plugins/commands/rdp/command.rb index 156312dd2..ba6d4d453 100644 --- a/plugins/commands/rdp/command.rb +++ b/plugins/commands/rdp/command.rb @@ -69,7 +69,15 @@ module VagrantPlugins end rdp_info[:username] = username end - + + if !rdp_info[:password] + username = ssh_info[:password] + if machine.config.vm.communicator == :winrm + username = machine.config.winrm.password + end + rdp_info[:password] = username + end + rdp_info[:host] ||= ssh_info[:host] rdp_info[:port] ||= machine.config.rdp.port From 8990e18e6df7324298905fc652b229a2efc42a36 Mon Sep 17 00:00:00 2001 From: Fabian Ruff Date: Mon, 27 Oct 2014 18:23:00 +0100 Subject: [PATCH 2/2] fix copy and paste bug --- plugins/commands/rdp/command.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/commands/rdp/command.rb b/plugins/commands/rdp/command.rb index ba6d4d453..e41c177fc 100644 --- a/plugins/commands/rdp/command.rb +++ b/plugins/commands/rdp/command.rb @@ -71,11 +71,11 @@ module VagrantPlugins end if !rdp_info[:password] - username = ssh_info[:password] + password = ssh_info[:password] if machine.config.vm.communicator == :winrm - username = machine.config.winrm.password + password = machine.config.winrm.password end - rdp_info[:password] = username + rdp_info[:password] = password end rdp_info[:host] ||= ssh_info[:host]