diff options
| author | ngourdon | 2019-04-28 17:36:07 +0200 |
|---|---|---|
| committer | techknowlogick | 2019-04-28 11:36:07 -0400 |
| commit | ed96b84b2ee748859afa9732c0e0339f3d93029e (patch) | |
| tree | 72f293f450f5893d88bfc0ff08b42a5ce15d43cc | |
| parent | 7284829962e52ba7f000e5e84c0ffb5b9046b08a (diff) | |
Set user search base field optional in DLDAP edit page (#6779) (#6789)
| -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 42424b50e..afa921967 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 530abd173..4f7961da6 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 8807657c3..6a176a43a 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"> |