diff options
| author | ngourdon <31291059+ngourdon@users.noreply.github.com> | 2019-04-28 15:53:55 +0200 |
|---|---|---|
| committer | techknowlogick <hello@techknowlogick.com> | 2019-04-28 09:53:55 -0400 |
| commit | d29d97d91cab8b34165ec65b9de3be746312f015 (patch) | |
| tree | 1ac917bd99c7ff124bc4878d77a0e94a5d4b4ce4 | |
| parent | 345bc06e56c05985611029c89cb15f0c9c10b686 (diff) | |
| download | gitea-d29d97d91cab8b34165ec65b9de3be746312f015.tar.gz gitea-d29d97d91cab8b34165ec65b9de3be746312f015.zip | |
Set user search base field optional in DLDAP edit page (#6779)
| -rw-r--r-- | docs/content/doc/features/authentication.en-us.md | 4 | ||||
| -rw-r--r-- | modules/auth/ldap/README.md | 4 | ||||
| -rw-r--r-- | templates/admin/auth/edit.tmpl | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/docs/content/doc/features/authentication.en-us.md b/docs/content/doc/features/authentication.en-us.md index 42424b50e4..afa9219676 100644 --- a/docs/content/doc/features/authentication.en-us.md +++ b/docs/content/doc/features/authentication.en-us.md @@ -115,6 +115,10 @@ Both the LDAP via BindDN and the simple auth LDAP share the following fields: - Example: `cn=%s,ou=Users,dc=mydomain,dc=com` - Example: `uid=%s,ou=Users,dc=mydomain,dc=com` +- User Search Base (optional) + - The LDAP base at which user accounts will be searched for. + - Example: `ou=Users,dc=mydomain,dc=com` + - User Filter **(required)** - An LDAP filter declaring when a user should be allowed to log in. The `%s` matching parameter will be substituted with login name given on sign-in diff --git a/modules/auth/ldap/README.md b/modules/auth/ldap/README.md index 530abd1735..4f7961da6b 100644 --- a/modules/auth/ldap/README.md +++ b/modules/auth/ldap/README.md @@ -94,6 +94,10 @@ share the following fields: * Example: cn=%s,ou=Users,dc=mydomain,dc=com * Example: uid=%s,ou=Users,dc=mydomain,dc=com +* User Search Base (optional) + * The LDAP base at which user accounts will be searched for. + * Example: ou=Users,dc=mydomain,dc=com + * User Filter **(required)** * An LDAP filter declaring when a user should be allowed to log in. The `%s` matching parameter will be substituted with the user's username. diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 8807657c33..6a176a43a8 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -58,7 +58,7 @@ {{end}} <div class="{{if .Source.IsLDAP}}required{{end}} field"> <label for="user_base">{{.i18n.Tr "admin.auths.user_base"}}</label> - <input id="user_base" name="user_base" value="{{$cfg.UserBase}}" placeholder="e.g. ou=Users,dc=mydomain,dc=com" required> + <input id="user_base" name="user_base" value="{{$cfg.UserBase}}" placeholder="e.g. ou=Users,dc=mydomain,dc=com" {{if .Source.IsLDAP}}required{{end}}> </div> {{if .Source.IsDLDAP}} <div class="required field"> |