diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-03-06 17:22:21 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-03-06 17:22:21 +0000 |
| commit | 482d9a4e82efd0466fb682a8edfc69a31cfbb297 (patch) | |
| tree | aaa7555646c10a496c2487e20c548896a3090418 /app/models/auth_source_ldap.rb | |
| parent | 533994e5ea00d8273298becd612f8615fba76c0c (diff) | |
| download | redmine-482d9a4e82efd0466fb682a8edfc69a31cfbb297.tar.gz redmine-482d9a4e82efd0466fb682a8edfc69a31cfbb297.zip | |
Fix LDAP authentication (#714, broken by r1194).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1199 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/auth_source_ldap.rb')
| -rw-r--r-- | app/models/auth_source_ldap.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index b4966c1e8..a438bd3c7 100644 --- a/app/models/auth_source_ldap.rb +++ b/app/models/auth_source_ldap.rb @@ -74,7 +74,7 @@ private :port => self.port, :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 end |