From ded0781f0d7e1d34fbf1855f3acf3438c29bcfd5 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 25 Feb 2011 18:12:24 +0000
Subject: [PATCH] Move ldapSyntaxes definition before all AttributeTypes. Makes it more obvious that the ldapsyntaxes are defined in the schema.
---
opends/resource/schema/00-core.ldif | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opends/resource/schema/00-core.ldif b/opends/resource/schema/00-core.ldif
index 342bb0c..db53379 100644
--- a/opends/resource/schema/00-core.ldif
+++ b/opends/resource/schema/00-core.ldif
@@ -22,6 +22,7 @@
#
#
# Copyright 2006-2010 Sun Microsystems, Inc.
+# Portions Copyright 2011 ForgeRock AS
#
#
# This file contains a core set of attribute type and objectlass definitions
@@ -32,6 +33,9 @@
objectClass: top
objectClass: ldapSubentry
objectClass: subschema
+ldapSyntaxes: ( 1.3.6.1.4.1.26027.1.3.6 DESC 'Collective Conflict Behavior'
+ X-ENUM ( 'real-overrides-virtual' 'virtual-overrides-real'
+ 'merge-real-and-virtual' ) )
attributeTypes: ( 2.5.4.41 NAME 'name' EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768}
X-ORIGIN 'RFC 4519' )
@@ -393,9 +397,6 @@
attributeTypes: ( 2.5.18.7 NAME 'collectiveExclusions'
EQUALITY objectIdentifierMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.38
USAGE directoryOperation X-ORIGIN 'RFC 3671' )
-ldapSyntaxes: ( 1.3.6.1.4.1.26027.1.3.6 DESC 'Collective Conflict Behavior'
- X-ENUM ( 'real-overrides-virtual' 'virtual-overrides-real'
- 'merge-real-and-virtual' ) )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.606
NAME 'collectiveConflictBehavior' SYNTAX 1.3.6.1.4.1.26027.1.3.6
SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
--
Gitblit v1.10.0