Added LDAPS support for LDAP authentication.

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

diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb
index fcb8447b75771057ad73240e048f5da97f862cc1..c8b0a12c98936ea28279ca4263be67a09dd83ab4 100644 (file)
--- 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
   

diff --git a/app/views/auth_sources/_form.rhtml b/app/views/auth_sources/_form.rhtml
index b6365dce523578331ff98029bb756c5205b7fde7..24d2913e3382772e9f4a4cdeb898c5e7e47e96b7 100644 (file)
--- a/app/views/auth_sources/_form.rhtml
+++ b/app/views/auth_sources/_form.rhtml
@@ -9,7 +9,7 @@
 <%= text_field 'auth_source', 'host'  %></p>
 
 <p><label for="auth_source_port"><%=l(:field_port)%> <span class="required">*</span></label>
-<%= text_field 'auth_source', 'port', :size => 6 %></p>
+<%= text_field 'auth_source', 'port', :size => 6 %> <%= check_box 'auth_source', 'tls'  %> LDAPS</p>
 
 <p><label for="auth_source_account"><%=l(:field_account)%></label>
 <%= text_field 'auth_source', 'account'  %></p>