diff options
| author | Olivier Lamy <olamy@apache.org> | 2013-01-21 23:11:33 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2013-01-21 23:11:33 +0000 |
| commit | 26afe7802f4fa90ed4d3e8273b21ef74c302902d (patch) | |
| tree | 6237bc2f361c8df19f4330ca4a5c78f5db78a25e | |
| parent | 931c1cd2954796cc14748a9b6b3aed107d8c5b92 (diff) | |
| download | archiva-26afe7802f4fa90ed4d3e8273b21ef74c302902d.tar.gz archiva-26afe7802f4fa90ed4d3e8273b21ef74c302902d.zip | |
ensure using default role names when configured
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1436685 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java index 921868c76..722ebcaff 100644 --- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java +++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java @@ -57,7 +57,7 @@ import java.util.Set; * @author Olivier Lamy * @since 2.1 */ -@Service( "ldapRoleMapper#default" ) +@Service("ldapRoleMapper#default") public class DefaultLdapRoleMapper implements LdapRoleMapper { @@ -68,7 +68,7 @@ public class DefaultLdapRoleMapper private LdapConnectionFactory ldapConnectionFactory; @Inject - @Named( value = "userConfiguration#default" ) + @Named(value = "userConfiguration#default") private UserConfiguration userConf; //--------------------------- @@ -414,6 +414,13 @@ public class DefaultLdapRoleMapper roles.add( role ); } } + else + { + if ( this.useDefaultRoleName ) + { + roles.add( group ); + } + } } return new ArrayList<String>( roles ); @@ -800,7 +807,6 @@ public class DefaultLdapRoleMapper } - public String getUserIdAttribute() { return userIdAttribute; |