Skip to content
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.

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

Normalize the encryption parameter passed to the LDAP constructor #264

Merged
merged 1 commit into from
Feb 3, 2016
Merged

Normalize the encryption parameter passed to the LDAP constructor #264

merged 1 commit into from
Feb 3, 2016

Conversation

ryanshow
Copy link
Contributor

This PR restores API functionality that was broken on 0.13, the encryption parameter can again be specified as a symbol and will be normalized to the expected hash.

This is in reference to #250

when :simple_tls, :start_tls
{ :method => method, :tls_options => {} }
end
end
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!
Could you make normalize_encryption do what #257 does?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, what exactly would you like me to do? The method should take 1 of 4 types of arguments (nil, string, symbol, or hash) and return either nil or a hash.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, sorry, I misunderstood. the purpose of this method is to normalize (I was thinking of validating a given encryption option when I saw your PR).
Anyway, please forget about my comment 🙇

jch added a commit that referenced this pull request Feb 3, 2016
Normalize the encryption parameter passed to the LDAP constructor
@jch jch merged commit 5f7d795 into ruby-ldap:master Feb 3, 2016
@satoryu satoryu mentioned this pull request Feb 3, 2016
jsonn pushed a commit to jsonn/pkgsrc that referenced this pull request Mar 16, 2016
=== Net::LDAP 0.14.0

* Normalize the encryption parameter passed to the LDAP constructor {#264}[ruby-ldap/ruby-net-ldap#264]
* Update Docs: Net::LDAP now requires ruby >= 2 {#261}[ruby-ldap/ruby-net-ldap#261]
* fix symbol proc {#255}[ruby-ldap/ruby-net-ldap#255]
* fix trailing commas {#256}[ruby-ldap/ruby-net-ldap#256]
* fix deprecated hash methods {#254}[ruby-ldap/ruby-net-ldap#254]
* fix space after comma {#253}[ruby-ldap/ruby-net-ldap#253]
* fix space inside brackets {#252}[ruby-ldap/ruby-net-ldap#252]
* Rubocop style fixes {#249}[ruby-ldap/ruby-net-ldap#249]
* Lazy initialize Net::LDAP::Connection's internal socket {#235}[ruby-ldap/ruby-net-ldap#235]
* Support for rfc3062 Password Modify, closes #163 {#178}[ruby-ldap/ruby-net-ldap#178]
This was referenced Jan 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants