You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2013/10/30 18:56:22 UTC
svn commit: r1537209 -
/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
Author: janstey
Date: Wed Oct 30 17:56:22 2013
New Revision: 1537209
URL: http://svn.apache.org/r1537209
Log:
KARAF-2540 - LDAP authentication defaults to null if not specified
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java?rev=1537209&r1=1537208&r2=1537209&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java Wed Oct 30 17:56:22 2013
@@ -43,6 +43,8 @@ import java.util.regex.Pattern;
*/
public class LDAPLoginModule extends AbstractKarafLoginModule {
+ private static final String DEFAULT_AUTHENTICATION = "simple";
+
private static Logger logger = LoggerFactory.getLogger(LDAPLoginModule.class);
public final static String CONNECTION_URL = "connection.url";
@@ -78,7 +80,7 @@ public class LDAPLoginModule extends Abs
private String roleFilter;
private String roleNameAttribute;
private boolean roleSearchSubtree = true;
- private String authentication = "simple";
+ private String authentication = DEFAULT_AUTHENTICATION;
private String initialContextFactory = null;
private boolean ssl;
private String sslProvider;
@@ -106,6 +108,9 @@ public class LDAPLoginModule extends Abs
initialContextFactory = DEFAULT_INITIAL_CONTEXT_FACTORY;
}
authentication = (String) options.get(AUTHENTICATION);
+ if (authentication == null) {
+ authentication = DEFAULT_AUTHENTICATION;
+ }
if (connectionURL == null || connectionURL.trim().length() == 0) {
logger.error("No LDAP URL specified.");
} else if (!connectionURL.startsWith("ldap:") && !connectionURL.startsWith("ldaps:")) {