From 59852e79deee94796ce21322bd5640fc909a8c09 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 9 Apr 2012 17:57:41 -0700 Subject: [PATCH 1/2] Don't use IdentitiesOnly under 'ssh -p' --- lib/vagrant/ssh.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/vagrant/ssh.rb b/lib/vagrant/ssh.rb index 03dfefe4f..54e431cbf 100644 --- a/lib/vagrant/ssh.rb +++ b/lib/vagrant/ssh.rb @@ -79,7 +79,8 @@ module Vagrant "-o", "StrictHostKeyChecking=no", "-o", "LogLevel=QUIET"] # Solaris/OpenSolaris/Illumos uses SunSSH which doesn't support the IdentitiesOnly option - command_options += ["-o", "IdentitiesOnly=yes"] if !Util::Platform.solaris? + # (Also don't use it in plain mode, it'll skip user agents.) + command_options += ["-o", "IdentitiesOnly=yes"] if !Util::Platform.solaris? || plain_mode command_options += ["-i", options[:private_key_path]] if !plain_mode command_options += ["-o", "ForwardAgent=yes"] if ssh_info[:forward_agent] From e35fac0986cd8e57e70d0e3df9c39567b6f5f5d0 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 9 Apr 2012 18:01:03 -0700 Subject: [PATCH 2/2] Protip, don't apply changes from old released versions to master --- lib/vagrant/ssh.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vagrant/ssh.rb b/lib/vagrant/ssh.rb index 54e431cbf..2e91c48c5 100644 --- a/lib/vagrant/ssh.rb +++ b/lib/vagrant/ssh.rb @@ -80,7 +80,7 @@ module Vagrant # Solaris/OpenSolaris/Illumos uses SunSSH which doesn't support the IdentitiesOnly option # (Also don't use it in plain mode, it'll skip user agents.) - command_options += ["-o", "IdentitiesOnly=yes"] if !Util::Platform.solaris? || plain_mode + command_options += ["-o", "IdentitiesOnly=yes"] if !(Util::Platform.solaris? || plain_mode) command_options += ["-i", options[:private_key_path]] if !plain_mode command_options += ["-o", "ForwardAgent=yes"] if ssh_info[:forward_agent]