Apply suggestions from code review

Co-Authored-By: Lauris BH <lauris@nix.lv>
Co-Authored-By: zeripath <art27@cantab.net>

Author: 3 people

modules/auth/ldap/README.md

@@ -112,7 +112,7 @@ share the following fields:
 
 * Group Name Filter (optional)
     * An LDAP filter declaring how to find valid groups in the above DN.
-    * Example: (|(cn=gogs_users)(cn=admins))
+    * Example: (|(cn=gitea_users)(cn=admins))
 
 * User Attribute in Group (optional)
     * Which user LDAP attribute is listed in the group.

modules/auth/ldap/ldap.go

@@ -306,7 +306,10 @@ func (ls *Source) SearchEntry(name, passwd string, directBind bool) *SearchResul
 
 	var isAttributeSSHPublicKeySet = len(strings.TrimSpace(ls.AttributeSSHPublicKey)) > 0
 
-	attribs := []string{ls.AttributeUsername, ls.AttributeName, ls.AttributeSurname, ls.AttributeMail, ls.UserUID}
+	attribs := []string{ls.AttributeUsername, ls.AttributeName, ls.AttributeSurname, ls.AttributeMail}
+	if len(strings.TrimSpace(ls.UserUID)) > 0 {
+		attribs = append(attribs, ls.UserUID)
+	}
 	if isAttributeSSHPublicKeySet {
 		attribs = append(attribs, ls.AttributeSSHPublicKey)
 	}