Relaxed the LDAP search a bit so that it also matches the 'cn' and 'mail' attributes.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@29615 71c3de6d-444a-0410-be80-ed276b4c234a

core/pom.xml

@@ -334,7 +334,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler-jelly</artifactId>
-      <version>1.138</version>
+      <version>1.139</version>
       <exclusions>
         <exclusion>
           <groupId>commons-jelly</groupId>

core/src/main/java/hudson/security/LDAPSecurityRealm.java

@@ -226,9 +226,9 @@ public class LDAPSecurityRealm extends SecurityRealm {
     /**
      * Query to locate an entry that identifies the user, given the user name string.
      *
-     * Normally "uid={0}"
+     * Normally something like "uid={0}"
      *
-     * @see FilterBasedLdapUserSearch
+     * @see FilterBasedLdapUserSearch#searchFilter
      */
     public final String userSearch;
     
@@ -282,7 +282,7 @@ public class LDAPSecurityRealm extends SecurityRealm {
         this.rootDN = rootDN.trim();
         this.userSearchBase = fixNull(userSearchBase).trim();
         userSearch = fixEmptyAndTrim(userSearch);
-        this.userSearch = userSearch!=null ? userSearch : "uid={0}";
+        this.userSearch = userSearch!=null ? userSearch : "(| (uid={0}) (mail={0}) (cn={0}))";
         this.groupSearchBase = fixEmptyAndTrim(groupSearchBase);
     }