You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/12/06 15:27:58 UTC
svn commit: r1210932 -
/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
Author: jbonofre
Date: Tue Dec 6 14:27:58 2011
New Revision: 1210932
URL: http://svn.apache.org/viewvc?rev=1210932&view=rev
Log:
[KARAF-606] Set the roleNameAttribute attribute optional in the LdapLoginModule
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=1210932&r1=1210931&r2=1210932&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 Tue Dec 6 14:27:58 2011
@@ -239,7 +239,9 @@ public class LDAPLoginModule extends Abs
} else {
controls.setSearchScope(SearchControls.ONELEVEL_SCOPE);
}
- controls.setReturningAttributes(new String[]{ roleNameAttribute });
+ if (roleNameAttribute != null) {
+ controls.setReturningAttributes(new String[]{ roleNameAttribute });
+ }
logger.debug("Looking for the user roles in LDAP with ");
logger.debug(" base DN: " + roleBaseDN);
roleFilter = roleFilter.replaceAll("%u", user);