You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2007/01/09 19:47:34 UTC
svn commit: r494517 - in /geronimo/server:
branches/1.2/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/
trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/
Author: vamsic007
Date: Tue Jan 9 10:47:33 2007
New Revision: 494517
URL: http://svn.apache.org/viewvc?view=rev&rev=494517
Log:
GERONIMO-2713 LDAP Realm fails to test and deploy
o The issue was fixed in branches\1.1 in rev 412812 to address GERONIMO-1791 GERONIMO-1817. The fix has not been merged into trunk.
o Applying the fix to branches\1.2 and trunk
Modified:
geronimo/server/branches/1.2/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java
Modified: geronimo/server/branches/1.2/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java?view=diff&rev=494517&r1=494516&r2=494517
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java Tue Jan 9 10:47:33 2007
@@ -57,6 +57,9 @@
import org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal;
+/**
+ * @version $Rev$ $Date$
+ */
public class LDAPLoginModule implements LoginModule {
private static Log log = LogFactory.getLog(LDAPLoginModule.class);
@@ -419,9 +422,9 @@
if (connectionPassword != null || !"".equals(connectionPassword)) {
env.put(Context.SECURITY_CREDENTIALS, connectionPassword);
}
- env.put(Context.SECURITY_PROTOCOL, connectionProtocol);
- env.put(Context.PROVIDER_URL, connectionURL);
- env.put(Context.SECURITY_AUTHENTICATION, authentication);
+ env.put(Context.SECURITY_PROTOCOL, connectionProtocol == null ? "" : connectionProtocol);
+ env.put(Context.PROVIDER_URL, connectionURL == null ? "" : connectionURL);
+ env.put(Context.SECURITY_AUTHENTICATION, authentication == null ? "" : authentication);
context = new InitialDirContext(env);
} catch (NamingException e) {
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java?view=diff&rev=494517&r1=494516&r2=494517
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java Tue Jan 9 10:47:33 2007
@@ -57,6 +57,9 @@
import org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal;
+/**
+ * @version $Rev$ $Date$
+ */
public class LDAPLoginModule implements LoginModule {
private static Log log = LogFactory.getLog(LDAPLoginModule.class);
@@ -419,9 +422,9 @@
if (connectionPassword != null || !"".equals(connectionPassword)) {
env.put(Context.SECURITY_CREDENTIALS, connectionPassword);
}
- env.put(Context.SECURITY_PROTOCOL, connectionProtocol);
- env.put(Context.PROVIDER_URL, connectionURL);
- env.put(Context.SECURITY_AUTHENTICATION, authentication);
+ env.put(Context.SECURITY_PROTOCOL, connectionProtocol == null ? "" : connectionProtocol);
+ env.put(Context.PROVIDER_URL, connectionURL == null ? "" : connectionURL);
+ env.put(Context.SECURITY_AUTHENTICATION, authentication == null ? "" : authentication);
context = new InitialDirContext(env);
} catch (NamingException e) {