Merge pull request #665 from mfazekas/5_2_0_rc2-preparev5.2.0.rc2

5 2 0 rc2 prepare

4 files changed, 23 insertions, 2 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 197a102..32977f5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+=== 5.2.0.rc2
+
+  * Read check_host_ip from ssh config files
+
 === 5.2.0.rc1
 
   * Interpret * and ? in know_hosts file [Romain Tartière, #660]
diff --git a/lib/net/ssh/config.rb b/lib/net/ssh/config.rb
index 03b7fb7..53070b0 100644
--- a/lib/net/ssh/config.rb
+++ b/lib/net/ssh/config.rb
@@ -24,6 +24,7 @@ module Net
     # * IdentityFile => maps to the :keys option
     # * IdentityAgent => :identity_agent
     # * IdentitiesOnly => :keys_only
+    # * CheckHostIP => :check_host_ip
     # * Macs => maps to the :hmac option
     # * PasswordAuthentication => maps to the :auth_methods option password
     # * Port => :port
@@ -76,6 +77,10 @@ module Net
         # #translate for how to convert the OpenSSH options into Net::SSH
         # options.)
         def load(path, host, settings={}, base_dir = nil)
+          translated_globals = {
+            "checkhostip" => "check_host_ip"
+          }
+
           file = File.expand_path(path)
           base_dir ||= File.dirname(file)
           return settings unless File.readable?(file)
@@ -96,6 +101,7 @@ module Net
             next if value.nil?
 
             key.downcase!
+            key = translated_globals[key] || key
             value = unquote(value)
 
             value = case value.strip
@@ -202,7 +208,8 @@ module Net
             fingerprinthash: :fingerprint_hash,
             port: :port,
             user: :user,
-            userknownhostsfile: :user_known_hosts_file
+            userknownhostsfile: :user_known_hosts_file,
+            checkhostip: :check_host_ip
           }
           case key
           when :ciphers
diff --git a/lib/net/ssh/version.rb b/lib/net/ssh/version.rb
index b812fdf..16e81fb 100644
--- a/lib/net/ssh/version.rb
+++ b/lib/net/ssh/version.rb
@@ -56,7 +56,7 @@ module Net
 
       # The prerelease component of this version of the Net::SSH library
       # nil allowed
-      PRE   = "rc1"
+      PRE   = "rc2"
 
       # The current version of the Net::SSH library as a Version instance
       CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)
diff --git a/test/test_config.rb b/test/test_config.rb
index d44fbce..b85f3c3 100644
--- a/test/test_config.rb
+++ b/test/test_config.rb
@@ -55,6 +55,16 @@ class TestConfig < NetSSHTest
     end
   end
 
+  def test_check_host_ip
+    data = %q{
+      CheckHostIP no
+    }
+    with_config_from_data data do |f|
+      config = Net::SSH::Config.load(f, 'foo')
+      assert_equal false, config['check_host_ip']
+    end
+  end
+
   def test_load_with_regex_chars
     data = %q{
       Host |