Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 93038 invoked from network); 30 Jan 2007 18:16:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Jan 2007 18:16:03 -0000 Received: (qmail 24291 invoked by uid 500); 30 Jan 2007 18:16:09 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 24259 invoked by uid 500); 30 Jan 2007 18:16:09 -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 24248 invoked by uid 99); 30 Jan 2007 18:16:09 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jan 2007 10:16:09 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jan 2007 10:16:02 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 4DC781A981A; Tue, 30 Jan 2007 10:15:42 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r501498 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Date: Tue, 30 Jan 2007 18:15:42 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070130181542.4DC781A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Tue Jan 30 10:15:41 2007 New Revision: 501498 URL: http://svn.apache.org/viewvc?view=rev&rev=501498 Log: Added a fix for DIRSERVER-835 Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=501498&r1=501497&r2=501498 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Tue Jan 30 10:15:41 2007 @@ -30,6 +30,7 @@ import javax.naming.NamingEnumeration; import javax.naming.NamingException; +import javax.naming.NoPermissionException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; @@ -1341,6 +1342,15 @@ throw new LdapInvalidAttributeIdentifierException(); } + // We will forbid modification of operationnal attributes which are not + // user modifiable. + AttributeType attributeType = atRegistry.lookup( change.getID() ); + + if ( !attributeType.isCanUserModify() ) + { + throw new NoPermissionException( "Cannot modify the attribute '" + change.getID() + "'" ); + } + switch ( modOp ) { case DirContext.ADD_ATTRIBUTE :