geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Backing out LDAP connect timeout fix because the

Browse Source 
sun.jndi.ldap.connect.timeout environment variable does not seem to be
compatible with LDAP connections over SSL.
This commit is contained in:
Juan Carlos Luciani 2008-04-28 21:51:37 +00:00
parent 8633d3e988
commit a33fdd0960
4 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java
View File

@ -737,7 +737,6 @@ public final class CasaIdentityToken implements IdentityToken
{ {
// Open a directory context and use it to read the identity attributes. // Open a directory context and use it to read the identity attributes.
Hashtable env = new Hashtable(); 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(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
env.put(Realm.REALM_CONFIG_LOCATION, svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile)); env.put(Realm.REALM_CONFIG_LOCATION, svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
env.put(Realm.REALM_SELECTOR, sourceName); env.put(Realm.REALM_SELECTOR, sourceName);

1
CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java
View File

@ -208,7 +208,6 @@ public final class Krb5Authenticate implements AuthMechanism, Serializable
// Open a directory context and use it to identify the users // Open a directory context and use it to identify the users
// associated with the specified surname. // associated with the specified surname.
Hashtable env = new Hashtable(); 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(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
env.put(Realm.REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile)); env.put(Realm.REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
env.put(Realm.REALM_SELECTOR, authReqMsg.getRealm()); env.put(Realm.REALM_SELECTOR, authReqMsg.getRealm());

2
CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java
View File

@ -183,7 +183,6 @@ public final class PwdAuthenticate implements AuthMechanism, Serializable
// Open a directory context and use it to identify the users // Open a directory context and use it to identify the users
// associated with the specified surname. // associated with the specified surname.
Hashtable env = new Hashtable(); 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(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
env.put(Realm.REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile)); env.put(Realm.REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
env.put(Realm.REALM_SELECTOR, authReqMsg.getRealm()); env.put(Realm.REALM_SELECTOR, authReqMsg.getRealm());
@ -274,7 +273,6 @@ public final class PwdAuthenticate implements AuthMechanism, Serializable
try try
{ {
Hashtable env2 = new Hashtable(); 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(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
env2.put(Realm.REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile)); env2.put(Realm.REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
env2.put(Realm.REALM_SELECTOR, authReqMsg.getRealm()); env2.put(Realm.REALM_SELECTOR, authReqMsg.getRealm());

1
CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/RealmsInfo.java
View File

@ -215,7 +215,6 @@ public class RealmsInfo
// users attribute which theoretically should only be valid on an AD // users attribute which theoretically should only be valid on an AD
// server. // server.
Hashtable env = new Hashtable(); 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(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
env.put(Realm.REALM_CONFIG_LOCATION, realmConfigFilePath); env.put(Realm.REALM_CONFIG_LOCATION, realmConfigFilePath);
env.put(Realm.REALM_SELECTOR, realm.getId()); env.put(Realm.REALM_SELECTOR, realm.getId());