Fixed a bug in inferring root DN in non-anonymous LDAP environment.

(<a href="http://www.nabble.com/Hudson-non-anonymous-LDAP-broken---td24529557.html">report</a>)


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

Originally-Committed-As: 76aec3268af9b570a3b964be1d4c13789266da8a
This commit is contained in:
kohsuke 2009-07-22 00:35:13 +00:00
parent fdff9ed7b6
commit 1e8a49bf99

View file

@ -276,14 +276,14 @@ public class LDAPSecurityRealm extends SecurityRealm {
@DataBoundConstructor
public LDAPSecurityRealm(String server, String rootDN, String userSearchBase, String userSearch, String groupSearchBase, String managerDN, String managerPassword) {
this.server = server.trim();
this.managerDN = Util.fixEmpty(managerDN);
this.managerPassword = Scrambler.scramble(Util.fixEmpty(managerPassword));
if(Util.fixEmptyAndTrim(rootDN)==null) rootDN=Util.fixNull(inferRootDN(server));
this.rootDN = rootDN.trim();
this.userSearchBase = userSearchBase.trim();
userSearch = Util.fixEmptyAndTrim(userSearch);
this.userSearch = userSearch!=null ? userSearch : "uid={0}";
this.groupSearchBase = Util.fixEmptyAndTrim(groupSearchBase);
this.managerDN = Util.fixEmpty(managerDN);
this.managerPassword = Scrambler.scramble(Util.fixEmpty(managerPassword));
}
public String getServerUrl() {