Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 68666 invoked from network); 30 Sep 2005 08:52:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 Sep 2005 08:52:36 -0000 Received: (qmail 12259 invoked by uid 500); 30 Sep 2005 08:52:35 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 12204 invoked by uid 500); 30 Sep 2005 08:52:35 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 12193 invoked by uid 99); 30 Sep 2005 08:52:35 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Sep 2005 01:52:35 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 30 Sep 2005 01:52:40 -0700 Received: (qmail 68599 invoked by uid 65534); 30 Sep 2005 08:52:13 -0000 Message-ID: <20050930085213.68598.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r292679 - /directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java Date: Fri, 30 Sep 2005 08:52:13 -0000 To: commits@directory.apache.org From: trustin@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trustin Date: Fri Sep 30 01:52:10 2005 New Revision: 292679 URL: http://svn.apache.org/viewcvs?rev=292679&view=rev Log: Fixed that ProtectedItem.SelfValue is not evaluated correctly. Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java?rev=292679&r1=292678&r2=292679&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java Fri Sep 30 01:52:10 2005 @@ -218,7 +218,7 @@ } else if( item instanceof ProtectedItem.SelfValue ) { - if( scope != OperationScope.ATTRIBUTE_TYPE_AND_VALUE || + if( scope != OperationScope.ATTRIBUTE_TYPE_AND_VALUE && scope != OperationScope.ATTRIBUTE_TYPE ) { continue; @@ -227,10 +227,14 @@ ProtectedItem.SelfValue sv = ( ProtectedItem.SelfValue ) item; for( Iterator j = sv.iterator(); j.hasNext(); ) { - Attribute attr = entry.get( String.valueOf( j.next() ) ); - if( attr.contains( userName ) || attr.contains( userName.toString() ) ) + String svItem = String.valueOf( j.next() ); + if( svItem.equalsIgnoreCase( attrId ) ) { - return true; + Attribute attr = entry.get( attrId ); + if( attr != null && ( attr.contains( userName ) || attr.contains( userName.toString() ) ) ) + { + return true; + } } } }