diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2017-07-16 09:16:18 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-07-16 09:16:18 +0000 |
| commit | 7d819d524554acbf2eeb4d0d37e1ff1f8c2339f5 (patch) | |
| tree | 0cc0e94b4ca7a384c2a2c56ae6cc61a3fb087437 | |
| parent | d9ed329b8c4282e8b722034df22dc1949e46c732 (diff) | |
| parent | 8d0b064dcb3ba7424e4f45047bba98b4bce9f60d (diff) | |
| download | gitlab-ce-7d819d524554acbf2eeb4d0d37e1ff1f8c2339f5.tar.gz | |
Merge branch 'ad_matching_rule_doc' into 'master'
Add AD matching rule filter and more information
See merge request !12871
| -rw-r--r-- | doc/administration/auth/ldap.md | 7 |
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. |