From d29d97d91cab8b34165ec65b9de3be746312f015 Mon Sep 17 00:00:00 2001
From: ngourdon <31291059+ngourdon@users.noreply.github.com>
Date: Sun, 28 Apr 2019 15:53:55 +0200
Subject: [PATCH] Set user search base field optional in DLDAP edit page
 (#6779)

---
 docs/content/doc/features/authentication.en-us.md | 4 ++++
 modules/auth/ldap/README.md                       | 4 ++++
 templates/admin/auth/edit.tmpl                    | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/content/doc/features/authentication.en-us.md b/docs/content/doc/features/authentication.en-us.md
index 42424b50e4b..afa92196763 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 530abd17352..4f7961da6b0 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 8807657c33c..6a176a43a84 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">