Merge pull request #176 from ruby-ldap/fix-nil-tls-options

Fix nil :tls_options

Author: jch

lib/net/ldap/connection.rb

@@ -89,6 +89,7 @@ def self.wrap_with_ssl(io, tls_options = {})
   # generously contributing the :start_tls path.
   #++
   def setup_encryption(args)
+    args[:tls_options] ||= {}
     case args[:method]
     when :simple_tls
       @conn = self.class.wrap_with_ssl(@conn, args[:tls_options])

test/test_ldap_connection.rb

@@ -202,7 +202,7 @@ def test_queued_read_setup_encryption_with_start_tls
       and_return(result2)
     mock.should_receive(:write)
     conn = Net::LDAP::Connection.new(:socket => mock)
-    flexmock(Net::LDAP::Connection).should_receive(:wrap_with_ssl).with(mock, nil).
+    flexmock(Net::LDAP::Connection).should_receive(:wrap_with_ssl).with(mock, {}).
       and_return(mock)
 
     conn.next_msgid # simulates ongoing query