diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 21:06:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 21:06:27 +0300 |
| commit | d2801eda8464e5e9ce730caf30111c1190fe87a0 (patch) | |
| tree | 9b2814ff0c6a61ac192b86afaa35fa2d1985277b /doc/administration/auth | |
| parent | 88542a5e9613c8442a982e65ad5cf13eb33bc541 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/auth')
| -rw-r--r-- | doc/administration/auth/smartcard.md | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/doc/administration/auth/smartcard.md b/doc/administration/auth/smartcard.md index eb63df6b482..85ed4355e80 100644 --- a/doc/administration/auth/smartcard.md +++ b/doc/administration/auth/smartcard.md @@ -51,10 +51,14 @@ This is an experimental feature. Smartcard authentication against local database change or be removed completely in future releases. To use a smartcard with an X.509 certificate to authenticate against a local -database with GitLab, at least one of the `subjectAltName` (SAN) extensions -need to define the user identity (`email`) within the GitLab instance (`URI`). - -`URI`: needs to match `Gitlab.config.host.gitlab`. +database with GitLab, in: + +- GitLab 12.4 and later, at least one of the `subjectAltName` (SAN) extensions + need to define the user identity (`email`) within the GitLab instance (`URI`). + `URI`: needs to match `Gitlab.config.host.gitlab`. +- From [GitLab 12.5](https://gitlab.com/gitlab-org/gitlab/issues/33907), + if your certificate contains only **one** SAN email entry, you don't need to + add or modify it to match the `email` with the `URI`. For example: |