directory-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Seelmann <m...@stefan-seelmann.de>
Subject Re: directory-fortress-core git commit: cleanup pw policy javadoc
Date Thu, 29 Jun 2017 18:39:05 GMT
On 06/29/2017 05:30 AM, smckinney@apache.org wrote:
> Repository: directory-fortress-core
> Updated Branches:
>   refs/heads/master 235774d76 -> 6c2832e5a
> 
> 
> cleanup pw policy javadoc
> 
> 
> Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
> Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/6c2832e5
> Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/6c2832e5
> Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/6c2832e5
> 
> Branch: refs/heads/master
> Commit: 6c2832e5a750515eb6e216cab3271e64c2952bea
...
> http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6c2832e5/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
> ----------------------------------------------------------------------
> diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
> index 26321b1..869be5c 100755
> --- a/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
> +++ b/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
> @@ -228,7 +228,8 @@ final class SDUtil
>                      matchCount++;
>  
>                      // Does the match count exceed the cardinality allowed for this
particular DSD set?
> -                    if (matchCount >= dsd.getCardinality() - 1)
> +//                    if (matchCount >= dsd.getCardinality() - 1)
> +                    if (matchCount > dsd.getCardinality())
>                      {
>                          // Yes, the target role violates DSD cardinality rule.
>                          String error = "validateDSD failed for role [" + role.getName()
+ "] DSD Set Name:" + dsd.getName() + " Cardinality:" + dsd.getCardinality();

Not sure, but probably this change was accidentially included in this
commit? At least the Jenkins jobs fail with some DSD cardinality mismatch.

[1]
https://builds.apache.org/view/A-D/view/Directory/job/dir-fortress-core-docker-apacheds-test/
[2]
https://builds.apache.org/view/A-D/view/Directory/job/dir-fortress-core-docker-openldap-test/

Mime
View raw message