Forward agent and forward X11 properly appear in `ssh_config` output. [closes GH-105]

CHANGELOG.md

@@ -12,6 +12,8 @@
   - `ssh_config` host name will use VM name if given. [GH-332]
   - `ssh` `-e` flag changed to `-c` to align with `ssh` standard
     behavior. [GH-323]
+  - Forward agent and forward X11 settings properly appear in
+    `ssh_config` output. [GH-105]
 
 ## 0.7.6 (July 2, 2011)
 

lib/vagrant/command/ssh_config.rb

@@ -18,7 +18,9 @@ module Vagrant
           :ssh_host => vm.env.config.ssh.host,
           :ssh_user => vm.env.config.ssh.username,
           :ssh_port => vm.ssh.port,
-          :private_key_path => vm.env.config.ssh.private_key_path
+          :private_key_path => vm.env.config.ssh.private_key_path,
+          :forward_agent => vm.env.config.ssh.forward_agent,
+          :forward_x11   => vm.env.config.ssh.forward_x11
         }))
       end
     end

lib/vagrant/config/ssh.rb

@@ -17,6 +17,8 @@ module Vagrant
       def initialize
         @sudo_shell = "bash"
         @port = nil
+        @forward_agent = false
+        @forward_x11 = false
       end
 
       def private_key_path

templates/ssh_config.erb

@@ -7,3 +7,9 @@ Host <%= host_key %>
   PasswordAuthentication no
   IdentityFile <%= private_key_path %>
   IdentitiesOnly yes
+<% if forward_agent -%>
+  ForwardAgent yes
+<% end -%>
+<% if forward_x11 -%>
+  ForwardX11 yes
+<% end -%>