Skip to content

Fix nil :tls_options #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jch merged 3 commits into from
Dec 19, 2014
Merged

Fix nil :tls_options #176

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e59543b
fix nil tls_options
Dec 17, 2014
13ca7c9
encryption defaults empty :tls_options
Dec 17, 2014
f8987cb
update mock
Dec 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix nil tls_options
  • Loading branch information
Jerry Cheung committed Dec 17, 2014
commit e59543bb28f14083cf73ca2ee2f2a99d03560038
2 changes: 1 addition & 1 deletion lib/net/ldap/connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def self.wrap_with_ssl(io, tls_options = {})
def setup_encryption(args)
case args[:method]
when :simple_tls
@conn = self.class.wrap_with_ssl(@conn, args[:tls_options])
@conn = self.class.wrap_with_ssl(@conn, args.fetch(:tls_options, {}))
# additional branches requiring server validation and peer certs, etc.
# go here.
when :start_tls
Expand Down