etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6210: LDAP:listLdapUsers api throws exception when we click on "Add LDAP Account" This occurs when ldap basedn is not configured. Throwing an IAE and a proper message is returned from the api call 

Signed-off-by: Ian Duffy <ian@ianduffy.ie>
(cherry picked from commit 4552ec6322)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java
This commit is contained in:
Rajani Karuturi 2014-03-07 11:13:35 +05:30 committed by Rohit Yadav
parent 2de93881c7
commit e3a1288763
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java
View File

@ -31,6 +31,8 @@ import javax.naming.directory.SearchResult;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.StringUtils;
public class LdapUserManager {
@Inject
@ -193,4 +195,4 @@ public class LdapUserManager {
}
return context.search(basedn, generateSearchFilter(username), controls);
}
}
}