kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix LDAP authentication (#714, broken by r1194). 

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1199 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-03-06 17:22:21 +00:00
parent 533994e5ea
commit 482d9a4e82
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/auth_source_ldap.rb
View File

@ -74,7 +74,7 @@ private
:port => self.port, :port => self.port,
:encryption => (self.tls ? :simple_tls : nil) :encryption => (self.tls ? :simple_tls : nil)
} }
options.merge(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank? options.merge!(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank?
Net::LDAP.new options Net::LDAP.new options
end end