hhernandez 2003/06/27 14:39:28
Modified: src/java/org/apache/turbine/services/security/ldap Tag:
TURBINE_2_2_BRANCH LDAPSecurityConstants.java
LDAPUserManager.java
Log:
Fixed an error in the configuration of the LDAP provider and the LDAP
authentication.
Fix submited by: Sachin Kumar skumar1 at novell.com
Revision Changes Path
No revision
No revision
1.1.1.1.2.1 +1 -0
jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap/LDAPSecurityConstants.java
Index: LDAPSecurityConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap/LDAPSecurityConstants.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- LDAPSecurityConstants.java 16 Aug 2001 05:09:19 -0000 1.1.1.1
+++ LDAPSecurityConstants.java 27 Jun 2003 21:39:28 -0000 1.1.1.1.2.1
@@ -71,4 +71,5 @@
public static final String LDAP_HOST = "ldap.host";
public static final String LDAP_PORT = "ldap.port";
public static final String LDAP_PROVIDER = "ldap.provider";
+ public static final String LDAP_AUTHENTICATION = "ldap.security.authentication";
}
1.3.2.1 +5 -3
jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap/LDAPUserManager.java
Index: LDAPUserManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap/LDAPUserManager.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- LDAPUserManager.java 11 Jul 2002 16:53:24 -0000 1.3
+++ LDAPUserManager.java 27 Jun 2003 21:39:28 -0000 1.3.2.1
@@ -418,6 +418,8 @@
{
String host = TurbineResources.getString(LDAP_HOST);
String port = TurbineResources.getString(LDAP_PORT);
+ String ldapProvider = TurbineResources.getString(LDAP_PROVIDER);
+ String ldapAuthentication =
TurbineResources.getString(LDAP_AUTHENTICATION);
String providerURL = new String("ldap://"; + host + ":" + port);
@@ -426,10 +428,10 @@
* LDAP Provider.
*/
Hashtable env = new Hashtable();
- env.put(Context.INITIAL_CONTEXT_FACTORY, LDAP_PROVIDER);
+ env.put(Context.INITIAL_CONTEXT_FACTORY, ldapProvider);
env.put(Context.PROVIDER_URL, providerURL);
- env.put(Context.SECURITY_AUTHENTICATION, "simple");
+ env.put(Context.SECURITY_AUTHENTICATION, ldapAuthentication);
env.put(Context.SECURITY_PRINCIPAL, username);
env.put(Context.SECURITY_CREDENTIALS, password);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
