From e3a1288763c3e91f49fcbd85c5e978e69bdbb4d1 Mon Sep 17 00:00:00 2001 From: Rajani Karuturi Date: Fri, 7 Mar 2014 11:13:35 +0530 Subject: [PATCH] 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 (cherry picked from commit 4552ec632201e7432afae7770f5854aaa244267c) Signed-off-by: Rohit Yadav Conflicts: plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java --- .../ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java index afdf97540e5..32dc404cd4d 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java @@ -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); } -} \ No newline at end of file +}