From 482d9a4e82efd0466fb682a8edfc69a31cfbb297 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 6 Mar 2008 17:22:21 +0000 Subject: [PATCH] Fix LDAP authentication (#714, broken by r1194). git-svn-id: http://redmine.rubyforge.org/svn/trunk@1199 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/auth_source_ldap.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.39.5