diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-10 06:09:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-10 06:09:53 +0300 |
| commit | a8b811acdfb8200f30cdd70d290e87bb7ac46ab1 (patch) | |
| tree | 2c99eda1590d125cbee2350e373a63fee4d76f44 /doc/integration/kerberos.md | |
| parent | d8995bd33ff3a76a6d04a6900229c78c2fbcc0a6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration/kerberos.md')
| -rw-r--r-- | doc/integration/kerberos.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/integration/kerberos.md b/doc/integration/kerberos.md index 5ccb1552b39..2dc7b39386c 100644 --- a/doc/integration/kerberos.md +++ b/doc/integration/kerberos.md @@ -162,7 +162,7 @@ enabled, your users will be linked to their LDAP accounts on their first sign-in For this to work, some prerequisites must be met: The Kerberos username must match the LDAP user's UID. You can choose which LDAP -attribute is used as the UID in GitLab's [LDAP configuration](../administration/auth/ldap/index.md#configuration) +attribute is used as the UID in the GitLab [LDAP configuration](../administration/auth/ldap/index.md#configuration) but for Active Directory, this should be `sAMAccountName`. The Kerberos realm must match the domain part of the LDAP user's Distinguished |