You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/12/11 17:54:12 UTC
[32/41] git commit: updated refs/heads/4.4 to 010a217
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 <ia...@ianduffy.ie>
(cherry picked from commit 4552ec632201e7432afae7770f5854aaa244267c)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e3a12887
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e3a12887
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e3a12887
Branch: refs/heads/4.4
Commit: e3a1288763c3e91f49fcbd85c5e978e69bdbb4d1
Parents: 2de9388
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Fri Mar 7 11:13:35 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 11 20:48:07 2014 +0530
----------------------------------------------------------------------
.../ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e3a12887/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java
----------------------------------------------------------------------
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 afdf975..32dc404 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
+}