Author: olamy
Date: Tue Jan 8 23:55:16 2013
New Revision: 1430635
URL: http://svn.apache.org/viewvc?rev=1430635&view=rev
Log:
fix default groupdn
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java?rev=1430635&r1=1430634&r2=1430635&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
Tue Jan 8 23:55:16 2013
@@ -80,7 +80,12 @@ public class DefaultLdapRoleMapper
this.baseDn = userConf.getConcatenatedList(
UserConfigurationKeys.LDAP_BASEDN, this.baseDn );
- this.groupsDn = userConf.getConcatenatedList(
UserConfigurationKeys.LDAP_GROUPS_BASEDN, this.baseDn );
+ this.groupsDn = userConf.getConcatenatedList(
UserConfigurationKeys.LDAP_GROUPS_BASEDN, this.groupsDn );
+
+ if ( StringUtils.isEmpty( this.groupsDn ) )
+ {
+ this.groupsDn = this.baseDn;
+ }
}
public String getLdapGroup( String role )
