From 482d9a4e82efd0466fb682a8edfc69a31cfbb297 2008-03-06 17:22:21
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: 2008-03-06 17:22:21
Subject: [PATCH] Fix LDAP authentication (#714, broken by r1194).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1199 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb
index b4966c1..a438bd3 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