summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDrew Blessing <drew@blessing.io>2017-07-14 12:44:39 +0000
committerDrew Blessing <drew@blessing.io>2017-07-14 12:44:39 +0000
commit8d0b064dcb3ba7424e4f45047bba98b4bce9f60d (patch)
treedc1ca184ec93b6f70b354441ff9f21281eb91987 /doc
parent7fbcdfb074a0ca92e3d35f6b3c4d78f1940f88ef (diff)
downloadgitlab-ce-8d0b064dcb3ba7424e4f45047bba98b4bce9f60d.tar.gz
Add AD matching rule filter and more informationad_matching_rule_doc
Diffstat (limited to 'doc')
-rw-r--r--doc/administration/auth/ldap.md7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md
index 725fc1f6076..c8987dea5e2 100644
--- a/doc/administration/auth/ldap.md
+++ b/doc/administration/auth/ldap.md
@@ -228,9 +228,14 @@ Tip: If you want to limit access to the nested members of an Active Directory
group you can use the following syntax:
```
-(memberOf=CN=My Group,DC=Example,DC=com)
+(memberOf:1.2.840.113556.1.4.1941=CN=My Group,DC=Example,DC=com)
```
+Find more information about this "LDAP_MATCHING_RULE_IN_CHAIN" filter at
+https://msdn.microsoft.com/en-us/library/aa746475(v=vs.85).aspx. Support for
+nested members in the user filter should not be confused with
+[group sync nested groups support (EE only)](https://docs.gitlab.com/ee/administration/auth/ldap-ee.html#supported-ldap-group-types-attributes).
+
Please note that GitLab does not support the custom filter syntax used by
omniauth-ldap.