Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CD649200CB6 for ; Thu, 29 Jun 2017 20:39:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CCC44160BED; Thu, 29 Jun 2017 18:39:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1E11E160BC6 for ; Thu, 29 Jun 2017 20:39:20 +0200 (CEST) Received: (qmail 20488 invoked by uid 500); 29 Jun 2017 18:39:20 -0000 Mailing-List: contact dev-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Apache Directory Developers List" Delivered-To: mailing list dev@directory.apache.org Received: (qmail 20476 invoked by uid 99); 29 Jun 2017 18:39:20 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Jun 2017 18:39:20 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id AF933188A36 for ; Thu, 29 Jun 2017 18:39:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.001 X-Spam-Level: X-Spam-Status: No, score=-0.001 tagged_above=-999 required=6.31 tests=[SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id Z9d7dZ7__sOK for ; Thu, 29 Jun 2017 18:39:17 +0000 (UTC) Received: from amber.s12n.de (amber.s12n.de [144.76.55.147]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id B360C5F341 for ; Thu, 29 Jun 2017 18:39:12 +0000 (UTC) Received: from [192.168.2.115] (aftr-62-216-207-64.dynamic.mnet-online.de [62.216.207.64]) by amber.s12n.de (Postfix) with ESMTPSA id 0F06929F482 for ; Thu, 29 Jun 2017 20:39:06 +0200 (CEST) Subject: Re: directory-fortress-core git commit: cleanup pw policy javadoc To: dev@directory.apache.org References: <4ecfcff2d8454ab8a47cbf6b166a9de2@git.apache.org> From: Stefan Seelmann Message-ID: <9f8d02b3-850f-8dff-dce1-7b43bfa3ad94@stefan-seelmann.de> Date: Thu, 29 Jun 2017 20:39:05 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 MIME-Version: 1.0 In-Reply-To: <4ecfcff2d8454ab8a47cbf6b166a9de2@git.apache.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Virus-Scanned: clamav-milter 0.99.2 at amber X-Virus-Status: Clean archived-at: Thu, 29 Jun 2017 18:39:22 -0000 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/