diff --git a/core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java b/core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java
index 6c3cfa46f3..b0c1670129 100644
--- a/core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java
+++ b/core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java
@@ -270,7 +270,7 @@ public class GlobalMatrixAuthorizationStrategy extends AuthorizationStrategy {
}
private String makeImg(String gif) {
- return String.format("
", Hudson.RESOURCE_PATH, gif);
+ return String.format("
", Hudson.getInstance().getRootUrlFromRequest(), Hudson.RESOURCE_PATH, gif);
}
}
}
diff --git a/core/src/main/java/hudson/security/LDAPSecurityRealm.java b/core/src/main/java/hudson/security/LDAPSecurityRealm.java
index 2b60d3aa1c..bf97f55798 100644
--- a/core/src/main/java/hudson/security/LDAPSecurityRealm.java
+++ b/core/src/main/java/hudson/security/LDAPSecurityRealm.java
@@ -250,8 +250,8 @@ public class LDAPSecurityRealm extends SecurityRealm {
if(Util.fixEmptyAndTrim(rootDN)==null) rootDN=Util.fixNull(inferRootDN(server));
this.rootDN = rootDN.trim();
this.userSearchBase = userSearchBase.trim();
- if(Util.fixEmptyAndTrim(userSearch)==null) userSearch="uid={0}";
- this.userSearch = userSearch.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));
@@ -327,7 +327,8 @@ public class LDAPSecurityRealm extends SecurityRealm {
@Override
public GroupDetails loadGroupByGroupname(String groupname) throws UsernameNotFoundException, DataAccessException {
// TODO: obtain a DN instead so that we can obtain multiple attributes later
- final Set groups = (Set)ldapTemplate.searchForSingleAttributeValues(groupSearchBase, GROUP_SEARCH,
+ String searchBase = groupSearchBase != null ? groupSearchBase : "";
+ final Set groups = (Set)ldapTemplate.searchForSingleAttributeValues(searchBase, GROUP_SEARCH,
new String[]{groupname}, "cn");
if(groups.isEmpty())