Fixed issue with setting the LDAP connect timeout variable that was

causing authentication to fail under windows with an Interger Exception
when instantiating an IAContext.

-This line, and those below, will be ignored--
i
M    server-java/Svc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java
M    server-java/Svc/src/com/novell/casa/authtoksvc/RealmsInfo.java
M    server-java/Svc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java
M    server-java/Svc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java
This commit is contained in:
Juan Carlos Luciani 2008-04-24 18:01:40 +00:00
parent c8265e8db6
commit 8633d3e988
4 changed files with 6 additions and 5 deletions

View File

@ -737,7 +737,7 @@ 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("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);

View File

@ -208,7 +208,7 @@ 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("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());

View File

@ -183,7 +183,7 @@ 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("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());
@ -207,6 +207,7 @@ public final class PwdAuthenticate implements AuthMechanism, Serializable
catch (Exception e) catch (Exception e)
{ {
m_log.warn("invoke(): Exception caught instantiating DirContext, msg = " + e.getMessage()); m_log.warn("invoke(): Exception caught instantiating DirContext, msg = " + e.getMessage());
m_log.debug("invoke(): Exception caught instantiating DirContext", e);
// Stop retrying // Stop retrying
break; break;
@ -273,7 +274,7 @@ 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("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());

View File

@ -215,7 +215,7 @@ 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("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());