From commits-return-13550-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Wed May 02 14:17:22 2007 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 99463 invoked from network); 2 May 2007 14:17:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 May 2007 14:17:21 -0000 Received: (qmail 97776 invoked by uid 500); 2 May 2007 14:17:28 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 97743 invoked by uid 500); 2 May 2007 14:17:28 -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 97731 invoked by uid 99); 2 May 2007 14:17:28 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2007 07:17:28 -0700 X-ASF-Spam-Status: No, hits=-99.5 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; Wed, 02 May 2007 07:17:21 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 045171A9838; Wed, 2 May 2007 07:17:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r534471 - /directory/apacheds/trunk/schema-bootstrap/src/main/schema/apache.schema Date: Wed, 02 May 2007 14:17:00 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070502141701.045171A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Wed May 2 07:16:59 2007 New Revision: 534471 URL: http://svn.apache.org/viewvc?view=rev&rev=534471 Log: Chabged some OIDs which were already declared in X.500 Modified: directory/apacheds/trunk/schema-bootstrap/src/main/schema/apache.schema Modified: directory/apacheds/trunk/schema-bootstrap/src/main/schema/apache.schema URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/schema/apache.schema?view=diff&rev=534471&r1=534470&r2=534471 ============================================================================== --- directory/apacheds/trunk/schema-bootstrap/src/main/schema/apache.schema (original) +++ directory/apacheds/trunk/schema-bootstrap/src/main/schema/apache.schema Wed May 2 07:16:59 2007 @@ -104,19 +104,22 @@ STRUCTURAL MUST prefNodeName ) -attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.12 NAME 'prescriptiveACI' +#attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.12 NAME 'prescriptiveACI' +attributetype ( 2.5.24.4 NAME 'prescriptiveACI' DESC 'Access control information that applies to a set of entries' EQUALITY directoryStringFirstComponentMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.1 USAGE directoryOperation ) -attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.13 NAME 'entryACI' +# was attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.13 NAME 'entryACI' ... +attributetype ( 2.5.24.5 NAME 'entryACI' DESC 'Access control information that applies to a single entry' EQUALITY directoryStringFirstComponentMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.1 USAGE directoryOperation ) -attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.14 NAME 'subentryACI' +#attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.14 NAME 'subentryACI' +attributetype ( 2.5.24.6 NAME 'subentryACI' DESC 'Access control information that applies to a single subentry' EQUALITY directoryStringFirstComponentMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.1