haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #877 from bitprophet/allow-agents-in-plain-mode 

Don't use IdentitiesOnly under 'ssh -p'
This commit is contained in:
Mitchell Hashimoto 2012-05-04 20:31:15 -07:00
parent b7b430714f e35fac0986
commit 04df9bc80b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/vagrant/ssh.rb
View File

@ -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]