diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-09-25 09:40:10 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-09-25 09:40:10 +0000 |
| commit | b4c78a58f5c5faef8a485903e5053f767221935c (patch) | |
| tree | b669e70a1360acd1185bb00769d7a7e81aa9967a | |
| parent | 3df32ac1290160680473248b48d1b12c96458bf7 (diff) | |
| parent | bcf0e4a85ae24662affa88cb32bbd490bc322980 (diff) | |
| download | gitlab-ce-b4c78a58f5c5faef8a485903e5053f767221935c.tar.gz | |
Merge branch 'patch-28' into 'master'
Update ldap.md If you escape the '\' character when using a "domain\user" scheme for the bind_dn name, it will fail. gitlab-ctl reconfigure escapes characters, and if you pre-escape the '\', the resultant yaml file will have four (4) '\' characters
See merge request gitlab-org/gitlab-ce!20460
| -rw-r--r-- | doc/administration/auth/ldap.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md index 67635d2e6ab..54ded25291a 100644 --- a/doc/administration/auth/ldap.md +++ b/doc/administration/auth/ldap.md @@ -111,7 +111,7 @@ main: uid: 'sAMAccountName' # This should be the attribute, not the value that maps to uid. ## - ## Examples: 'america\\momo' or 'CN=Gitlab Git,CN=Users,DC=mydomain,DC=com' + ## Examples: 'america\momo' or 'CN=Gitlab Git,CN=Users,DC=mydomain,DC=com' ## bind_dn: '_the_full_dn_of_the_user_you_will_bind_with' password: '_the_password_of_the_bind_user' |