lovejavaee
diff --git a/‎plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfiguration.java‎
Lines changed: 20 additions & 1 deletion b/‎plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfiguration.java‎
Lines changed: 20 additions & 1 deletion
diff --git a/‎plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapContextFactory.java‎
Lines changed: 1 addition & 1 deletion b/‎plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapContextFactory.java‎
Lines changed: 1 addition & 1 deletion
@@ -22,13 +22,18 @@
 import javax.naming.directory.SearchControls;
 
 import org.apache.cloudstack.api.command.LdapListConfigurationCmd;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 
 import com.cloud.utils.Pair;
 
-public class LdapConfiguration {
+public class LdapConfiguration implements Configurable{
     private final static String factory = "com.sun.jndi.ldap.LdapCtxFactory";
 
+    private static final ConfigKey<Long> ldapReadTimeout = new ConfigKey<Long>(Long.class, "ldap.read.timeout", "Advanced", "1000",
+        "LDAP connection Timeout in milli sec", true, ConfigKey.Scope.Global, 1l);
+
     private final static int scope = SearchControls.SUBTREE_SCOPE;
 
     @Inject
@@ -148,4 +153,18 @@ public String getGroupUniqueMemeberAttribute() {
     public String getCommonNameAttribute() {
         return "cn";
     }
+
+    public Long getReadTimeout() {
+        return ldapReadTimeout.value();
+    }
+
+    @Override
+    public String getConfigComponentName() {
+        return LdapConfiguration.class.getSimpleName();
+    }
+
+    @Override
+    public ConfigKey<?>[] getConfigKeys() {
+        return new ConfigKey<?>[] {ldapReadTimeout};
+    }
 }
@@ -82,7 +82,7 @@ private Hashtable<String, String> getEnvironment(final String principal, final S
 
         environment.put(Context.INITIAL_CONTEXT_FACTORY, factory);
         environment.put(Context.PROVIDER_URL, url);
-        environment.put("com.sun.jndi.ldap.read.timeout", "500");
+        environment.put("com.sun.jndi.ldap.read.timeout", _ldapConfiguration.getReadTimeout().toString());
         environment.put("com.sun.jndi.ldap.connect.pool", "true");
 
         enableSSL(environment);