Revision 1199
Added by Jean-Philippe Lang over 17 years ago
| trunk/app/models/auth_source_ldap.rb | ||
|---|---|---|
| 74 | 74 |
:port => self.port, |
| 75 | 75 |
:encryption => (self.tls ? :simple_tls : nil) |
| 76 | 76 |
} |
| 77 |
options.merge(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank?
|
|
| 77 |
options.merge!(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank?
|
|
| 78 | 78 |
Net::LDAP.new options |
| 79 | 79 |
end |
| 80 | 80 |
|
Also available in: Unified diff
Fix LDAP authentication (#714, broken by r1194).