Repository: archiva-redback-core Updated Branches: refs/heads/master 95dfab2b5 -> 0c61f4a4c
[MRM-1486] ldap.config.mapper.attribute.user.filter using ldap not working correctly with commas. Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/e15dad35 Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/e15dad35 Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/e15dad35 Branch: refs/heads/master Commit: e15dad3592085c8bf1be43f86ae033c0c2883a09 Parents: 95dfab2 Author: Olivier Lamy <[email protected]> Authored: Fri Jun 20 14:48:01 2014 +1000 Committer: Olivier Lamy <[email protected]> Committed: Fri Jun 20 14:48:01 2014 +1000 ---------------------------------------------------------------------- .../apache/archiva/redback/common/ldap/user/LdapUserMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/e15dad35/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java ---------------------------------------------------------------------- diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java index bb79545..13ed451 100644 --- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java +++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java @@ -76,7 +76,7 @@ public class LdapUserMapper userConf.getConcatenatedList( "ldap.config.base.dn", userBaseDn ) ); userObjectClass = userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_OBJECT_CLASS, userObjectClass ); - userFilter = userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_FILTER, userFilter ); + userFilter = userConf.getConcatenatedList( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_FILTER, userFilter ); maxResultCount = userConf.getInt( UserConfigurationKeys.LDAP_MAX_RESULT_COUNT, maxResultCount ); }
