Commit bac7d17c authored by Boris HUISGEN's avatar Boris HUISGEN

Fix LDAP TLS authentication

parent 67934145
...@@ -14,7 +14,15 @@ module Gitlab ...@@ -14,7 +14,15 @@ module Gitlab
end end
def self.adapter_options def self.adapter_options
encryption = config['method'].to_s == 'ssl' ? :simple_tls : nil encryption =
case config['method'].to_s
when 'ssl'
:simple_tls
when 'tls'
:start_tls
else
nil
end
options = { options = {
host: config['host'], host: config['host'],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment