From 7c90add67e39c30624cc71215793ad811e93666e Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 19 Aug 2011 12:51:18 +0000
Subject: [PATCH] Fix OPENDJ-266: Extra white space in some of the schema files shipped with OpenDJ 2.4
---
opends/resource/schema/03-changelog.ldif | 4 ++--
opends/resource/schema/05-rfc4876.ldif | 6 +++---
opends/resource/schema/00-core.ldif | 2 +-
opends/resource/schema/05-samba.ldif | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/resource/schema/00-core.ldif b/opends/resource/schema/00-core.ldif
index e6bfda1..24e845e 100644
--- a/opends/resource/schema/00-core.ldif
+++ b/opends/resource/schema/00-core.ldif
@@ -512,7 +512,7 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation
X-ORIGIN 'draft-ietf-boreham-numsubordinates' )
-attributeTypes: ( 2.16.840.1.113730.3.1.35 NAME 'changelog'
+attributeTypes: ( 2.16.840.1.113730.3.1.35 NAME 'changelog'
DESC 'the distinguished name of the entry which contains
the set of entries comprising this servers changelog'
EQUALITY distinguishedNameMatch
diff --git a/opends/resource/schema/03-changelog.ldif b/opends/resource/schema/03-changelog.ldif
index 30af275..e5a2978 100644
--- a/opends/resource/schema/03-changelog.ldif
+++ b/opends/resource/schema/03-changelog.ldif
@@ -104,9 +104,9 @@
USAGE directoryOperation
X-ORIGIN 'OpenDJ Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.1 NAME 'changeLogEntry' SUP top
- STRUCTURAL
+ STRUCTURAL
MUST ( changeNumber $ targetDN $ changeType $ changeTime )
MAY ( changes $ newRDN $ deleteOldRDN $ newSuperior )
X-ORIGIN 'draft-good-ldap-changelog' )
-objectClasses: ( 1.2.840.113556.1.3.23 NAME 'container' SUP top STRUCTURAL
+objectClasses: ( 1.2.840.113556.1.3.23 NAME 'container' SUP top STRUCTURAL
MUST cn X-ORIGIN 'Microsoft Active Directory' )
diff --git a/opends/resource/schema/05-rfc4876.ldif b/opends/resource/schema/05-rfc4876.ldif
index 0c3fc02..9ad05fa 100644
--- a/opends/resource/schema/05-rfc4876.ldif
+++ b/opends/resource/schema/05-rfc4876.ldif
@@ -32,7 +32,7 @@
# objectClass: top
# objectClass: organizationalUnit
# ou: profile
-#
+#
# dn: cn=Solaris,ou=profile,dc=example,dc=com
# objectClass: top
# objectClass: DUAConfigProfile
@@ -93,7 +93,7 @@
1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE X-ORIGIN 'RFC 4876' )
attributeTypes: ( 1.3.6.1.4.1.11.1.3.1.1.11 NAME 'objectclassMap'
DESC 'Object class mappings used, required, or supported by an agent or
- service' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ service' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
X-ORIGIN 'RFC 4876' )
attributeTypes: ( 1.3.6.1.4.1.11.1.3.1.1.12 NAME 'defaultSearchScope'
DESC 'Default scope used when performing a search' EQUALITY
@@ -124,4 +124,4 @@
credentialLevel $ authenticationMethod $ followReferrals $
dereferenceAliases $ serviceSearchDescriptor $ serviceCredentialLevel $
serviceAuthenticationMethod $ objectclassMap $ attributeMap $ profileTTL )
- X-ORIGIN 'RFC 4876' )
+ X-ORIGIN 'RFC 4876' )
diff --git a/opends/resource/schema/05-samba.ldif b/opends/resource/schema/05-samba.ldif
index 516e665..a526439 100644
--- a/opends/resource/schema/05-samba.ldif
+++ b/opends/resource/schema/05-samba.ldif
@@ -57,7 +57,7 @@
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.22 NAME 'sambaNextGroupRid' DESC 'Next NT rid to give out for groups' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.39 NAME 'sambaNextRid' DESC 'Next NT rid to give out for anything' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.40 NAME 'sambaAlgorithmicRidBase' DESC 'Base at which the samba RID generation algorithm should operate' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-attributeTypes: ( 1.3.6.1.4.1.7165.2.1.41 NAME 'sambaShareName' DESC 'Share Name' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.41 NAME 'sambaShareName' DESC 'Share Name' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.42 NAME 'sambaOptionName' DESC 'Option Name' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.43 NAME 'sambaBoolOption' DESC 'A boolean option' EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.44 NAME 'sambaIntegerOption' DESC 'An integer option' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
--
Gitblit v1.10.0