Backing out LDAP connect timeout fix because the
sun.jndi.ldap.connect.timeout environment variable does not seem to be compatible with LDAP connections over SSL.
This commit is contained in:
parent
8633d3e988
commit
a33fdd0960
@ -737,7 +737,6 @@ public final class CasaIdentityToken implements IdentityToken
|
||||
{
|
||||
// Open a directory context and use it to read the identity attributes.
|
||||
Hashtable env = new Hashtable();
|
||||
env.put("com.sun.jndi.ldap.connect.timeout", "15000"); // Override default LDAP timeout
|
||||
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
|
||||
env.put(Realm.REALM_CONFIG_LOCATION, svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
|
||||
env.put(Realm.REALM_SELECTOR, sourceName);
|
||||
|
@ -208,7 +208,6 @@ public final class Krb5Authenticate implements AuthMechanism, Serializable
|
||||
// Open a directory context and use it to identify the users
|
||||
// associated with the specified surname.
|
||||
Hashtable env = new Hashtable();
|
||||
env.put("com.sun.jndi.ldap.connect.timeout", "15000"); // Override default LDAP timeout
|
||||
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
|
||||
env.put(Realm.REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
|
||||
env.put(Realm.REALM_SELECTOR, authReqMsg.getRealm());
|
||||
|
@ -183,7 +183,6 @@ public final class PwdAuthenticate implements AuthMechanism, Serializable
|
||||
// Open a directory context and use it to identify the users
|
||||
// associated with the specified surname.
|
||||
Hashtable env = new Hashtable();
|
||||
env.put("com.sun.jndi.ldap.connect.timeout", "15000"); // Override default LDAP timeout
|
||||
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
|
||||
env.put(Realm.REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
|
||||
env.put(Realm.REALM_SELECTOR, authReqMsg.getRealm());
|
||||
@ -274,7 +273,6 @@ public final class PwdAuthenticate implements AuthMechanism, Serializable
|
||||
try
|
||||
{
|
||||
Hashtable env2 = new Hashtable();
|
||||
env2.put("com.sun.jndi.ldap.connect.timeout", "15000"); // Override default LDAP timeout
|
||||
env2.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
|
||||
env2.put(Realm.REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
|
||||
env2.put(Realm.REALM_SELECTOR, authReqMsg.getRealm());
|
||||
|
@ -215,7 +215,6 @@ public class RealmsInfo
|
||||
// users attribute which theoretically should only be valid on an AD
|
||||
// server.
|
||||
Hashtable env = new Hashtable();
|
||||
env.put("com.sun.jndi.ldap.connect.timeout", "15000"); // Override default LDAP timeout
|
||||
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
|
||||
env.put(Realm.REALM_CONFIG_LOCATION, realmConfigFilePath);
|
||||
env.put(Realm.REALM_SELECTOR, realm.getId());
|
||||
|
Loading…
Reference in New Issue
Block a user