summaryrefslogtreecommitdiffstats
path: root/app/models/auth_source_ldap.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-10-16 19:09:21 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-10-16 19:09:21 +0000
commit4c509c9423a11feb665e98e91661fc0a06a043a1 (patch)
tree947dddfc3f78d7c371834e8d2df32857a399f671 /app/models/auth_source_ldap.rb
parent9ce5713ee49166a826fcd4355aab825070ddfa07 (diff)
downloadredmine-4c509c9423a11feb665e98e91661fc0a06a043a1.tar.gz
redmine-4c509c9423a11feb665e98e91661fc0a06a043a1.zip
Added LDAPS support for LDAP authentication.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@844 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/auth_source_ldap.rb')
-rw-r--r--app/models/auth_source_ldap.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb
index fcb8447b7..c8b0a12c9 100644
--- a/app/models/auth_source_ldap.rb
+++ b/app/models/auth_source_ldap.rb
@@ -70,7 +70,8 @@ private
def initialize_ldap_con(ldap_user, ldap_password)
Net::LDAP.new( {:host => self.host,
:port => self.port,
- :auth => { :method => :simple, :username => ldap_user, :password => ldap_password }}
+ :auth => { :method => :simple, :username => ldap_user, :password => ldap_password },
+ :encryption => (self.tls ? :simple_tls : nil)}
)
end