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
fe2a57c9
Commit
fe2a57c9
authored
Sep 08, 2017
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/ldap-typo-docs' into 'master'
Fix small typos in LDAP documentation See merge request !2867
parents
2d1ab599
e2b79742
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
doc/administration/auth/ldap.md
doc/administration/auth/ldap.md
+4
-4
No files found.
doc/administration/auth/ldap.md
View file @
fe2a57c9
...
@@ -63,7 +63,7 @@ Copy/paste can sometimes cause problems.
...
@@ -63,7 +63,7 @@ Copy/paste can sometimes cause problems.
> **Note:** The `method` value `ssl` corresponds to 'Simple TLS' in the LDAP
> **Note:** The `method` value `ssl` corresponds to 'Simple TLS' in the LDAP
library.
`tls`
corresponds to StartTLS, not to be confused with regular TLS.
library.
`tls`
corresponds to StartTLS, not to be confused with regular TLS.
Normally, if you specify
`ssl`
i
s will be on port 636
while
`tls`
(StartTLS)
Normally, if you specify
`ssl`
i
t will be on port 636,
while
`tls`
(StartTLS)
would be on port 389.
`plain`
also operates on port 389.
would be on port 389.
`plain`
also operates on port 389.
**Omnibus configuration**
**Omnibus configuration**
...
@@ -278,7 +278,7 @@ production:
...
@@ -278,7 +278,7 @@ production:
```
```
Tip: If you want to limit access to the nested members of an Active Directory
Tip: If you want to limit access to the nested members of an Active Directory
group you can use the following syntax:
group
,
you can use the following syntax:
```
```
(memberOf:1.2.840.113556.1.4.1941:=CN=My Group,DC=Example,DC=com)
(memberOf:1.2.840.113556.1.4.1941:=CN=My Group,DC=Example,DC=com)
...
@@ -294,7 +294,7 @@ omniauth-ldap.
...
@@ -294,7 +294,7 @@ omniauth-ldap.
### Escaping special characters
### Escaping special characters
If the
`user_filter`
DN contains
a special characters. For example a comma
If the
`user_filter`
DN contains
special characters. For example, a comma:
```
```
OU=GitLab, Inc,DC=gitlab,DC=com
OU=GitLab, Inc,DC=gitlab,DC=com
...
@@ -302,7 +302,7 @@ OU=GitLab, Inc,DC=gitlab,DC=com
...
@@ -302,7 +302,7 @@ OU=GitLab, Inc,DC=gitlab,DC=com
This character needs to be escaped as documented in
[
RFC 4515
](
https://tools.ietf.org/search/rfc4515
)
.
This character needs to be escaped as documented in
[
RFC 4515
](
https://tools.ietf.org/search/rfc4515
)
.
Due to the way the string is parsed the special character needs to be convered
Due to the way the string is parsed
,
the special character needs to be convered
to hex and
`\\5C\\`
(
`5C`
=
`\` in hex) added before it.
to hex and
`\\5C\\`
(
`5C`
=
`\` in hex) added before it.
As an example the above DN would look like
As an example the above DN would look like
...
...
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