nicolabs/ldap-plugin
1
0
Fork 0
mirror of https://github.com/nicolabs/ldap-plugin.git synced 2025-09-07 05:14:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rolling back the LDAP change based on the discussion: http://n4.nabble.com/LDAP-change-tp1749752p1749752.html

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

Originally-Committed-As: 5e342c7e7c9811de253659331adb1d442feda6e8
This commit is contained in:
kohsuke 2010-04-06 23:18:41 +00:00
parent 5181479ad7
commit 6e7d0c9939
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/java/hudson/security/LDAPSecurityRealm.java
View file

@ -226,9 +226,9 @@ public class LDAPSecurityRealm extends SecurityRealm {
/** /**
* Query to locate an entry that identifies the user, given the user name string. * 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; public final String userSearch;
@ -282,7 +282,7 @@ public class LDAPSecurityRealm extends SecurityRealm {
this.rootDN = rootDN.trim(); this.rootDN = rootDN.trim();
this.userSearchBase = fixNull(userSearchBase).trim(); this.userSearchBase = fixNull(userSearchBase).trim();
userSearch = fixEmptyAndTrim(userSearch); 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); this.groupSearchBase = fixEmptyAndTrim(groupSearchBase);
} }