From 6e7d0c993974c22f09d97a091ed2f43166b1eec2 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 6 Apr 2010 23:18:41 +0000 Subject: [PATCH] rolling back the LDAP change based on the discussion: http://n4.nabble.com/LDAP-change-tp1749752p1749752.html git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@29831 71c3de6d-444a-0410-be80-ed276b4c234a Originally-Committed-As: 5e342c7e7c9811de253659331adb1d442feda6e8 --- core/src/main/java/hudson/security/LDAPSecurityRealm.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/security/LDAPSecurityRealm.java b/core/src/main/java/hudson/security/LDAPSecurityRealm.java index 9bc009d..d38bfee 100644 --- a/core/src/main/java/hudson/security/LDAPSecurityRealm.java +++ b/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 something like "uid={0}" + * Normally "uid={0}" * - * @see FilterBasedLdapUserSearch#searchFilter + * @see FilterBasedLdapUserSearch */ 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}) (mail={0}) (cn={0}))"; + this.userSearch = userSearch!=null ? userSearch : "uid={0}"; this.groupSearchBase = fixEmptyAndTrim(groupSearchBase); }