Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a48fffc4
Commit
a48fffc4
authored
Aug 16, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ldap adapter for ssl connection
parent
860a80ea
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
lib/gitlab/ldap/adapter.rb
lib/gitlab/ldap/adapter.rb
+7
-4
No files found.
lib/gitlab/ldap/adapter.rb
View file @
a48fffc4
...
...
@@ -10,17 +10,20 @@ module Gitlab
attr_reader
:ldap
def
initialize
encryption
=
config
[
'method'
].
to_s
==
'ssl'
?
:simple_tls
:
nil
options
=
{
host:
config
[
'host'
],
port:
config
[
'port'
],
encryption:
encryption
}
auth_options
=
{
auth:
{
method:
config
[
'method'
]
,
username:
config
[
'bind_dn'
],
password:
config
[
'password'
]
}
method: :simple
,
username:
config
[
'bind_dn'
],
password:
config
[
'password'
]
}
}
if
config
[
'password'
]
||
config
[
'bind_dn'
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment