You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2005/10/03 20:42:25 UTC

svn commit: r293426 - /directory/apacheds/trunk/core/src/main/schema/apache.schema

Author: akarasulu
Date: Mon Oct  3 11:42:23 2005
New Revision: 293426

URL: http://svn.apache.org/viewcvs?rev=293426&view=rev
Log:
correcting schema conflicts

Modified:
    directory/apacheds/trunk/core/src/main/schema/apache.schema

Modified: directory/apacheds/trunk/core/src/main/schema/apache.schema
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/schema/apache.schema?rev=293426&r1=293425&r2=293426&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/schema/apache.schema (original)
+++ directory/apacheds/trunk/core/src/main/schema/apache.schema Mon Oct  3 11:42:23 2005
@@ -83,7 +83,7 @@
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
     SINGLE-VALUE )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.25 NAME 'autonomousAreaSubentry'
+attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.29 NAME 'autonomousAreaSubentry'
     DESC 'Used to track a subentry associated with an autonomousArea'
     SUP distinguishedName
     EQUALITY distinguishedNameMatch
@@ -92,7 +92,7 @@
     NO-USER-MODIFICATION
     USAGE directoryOperation )
 
-attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.26 NAME 'accessControlSubentries'
+attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.28 NAME 'accessControlSubentries'
     DESC 'Used to track a subentry associated with access control areas'
     SUP distinguishedName
     EQUALITY distinguishedNameMatch