From f2779f45530c0e225e16563a7619a468e809e111 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 09 Nov 2006 23:12:06 +0000
Subject: [PATCH] Update the schema definitions based on RFC 2739 to correct a number of problems in the specification, including:

---
 opends/resource/schema/03-rfc2739.ldif |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/opends/resource/schema/03-rfc2739.ldif b/opends/resource/schema/03-rfc2739.ldif
index d009316..e1c2102 100644
--- a/opends/resource/schema/03-rfc2739.ldif
+++ b/opends/resource/schema/03-rfc2739.ldif
@@ -26,43 +26,47 @@
 #
 # This file contains schema definitions from RFC 2739, which defines a
 # mechanism for storing calendar and vCard objects in the Directory Server.
+# Note that the definition in RFC 2739 contains a number of errors, and this
+# schema file has been altered from the standard definition in order to fix
+# a number of those problems.
 dn: cn=schema
 objectClass: top
 objectClass: ldapSubentry
 objectClass: subschema
 attributeTypes: ( 1.2.840.113556.1.4.478 NAME 'calCalURI'
-  EQUALITY caseIgnoreMatch SUBSTRING caseIgnoreMatch
+  EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 USAGE userApplications
   X-ORIGIN 'RFC 2739' )
 attributeTypes: ( 1.2.840.113556.1.4.479 NAME 'calFBURL'
-  EQUALITY caseIgnoreMatch SUBSTRING caseIgnoreMatch
+  EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 USAGE userApplications
   X-ORIGIN 'RFC 2739' )
 attributeTypes: ( 1.2.840.113556.1.4.480 NAME 'calCAPURI'
-  EQUALITY caseIgnoreMatch SUBSTRING caseIgnoreMatch
+  EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 USAGE userApplications
   X-ORIGIN 'RFC 2739' )
 attributeTypes: ( 1.2.840.113556.1.4.481 NAME 'calCalAdrURI'
-  EQUALITY caseIgnoreMatch SUBSTRING caseIgnoreMatch
+  EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 USAGE userApplications
   X-ORIGIN 'RFC 2739' )
 attributeTypes: ( 1.2.840.113556.1.4.482 NAME 'calOtherCalURIs'
-  EQUALITY caseIgnoreMatch SUBSTRING caseIgnoreMatch
+  EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 USAGE userApplications
   X-ORIGIN 'RFC 2739' )
 attributeTypes: ( 1.2.840.113556.1.4.483 NAME 'calOtherFBURLs'
-  EQUALITY caseIgnoreMatch SUBSTRING caseIgnoreMatch
+  EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 USAGE userApplications
   X-ORIGIN 'RFC 2739' )
 attributeTypes: ( 1.2.840.113556.1.4.484 NAME 'calOtherCAPURIs'
-  EQUALITY caseIgnoreMatch SUBSTRING caseIgnoreMatch
+  EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 USAGE userApplications
   X-ORIGIN 'RFC 2739' )
 attributeTypes: ( 1.2.840.113556.1.4.485 NAME 'calOtherCalAdrURIs'
-  EQUALITY caseIgnoreMatch SUBSTRING caseIgnoreMatch
+  EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 USAGE userApplications
   X-ORIGIN 'RFC 2739' )
 objectClasses: ( 1.2.840.113556.1.5.87 NAME 'calEntry' TOP AUXILIARY
   MAY ( calCalURI $ calFBURL $ calOtherCalURIs $ calOtherFBURLs $ calCAPURI $
-  calOtherCAPURIs ) X-ORIGIN 'RFC 2739' )
+  calOtherCAPURIs $ calCalAdrURI $ calOtherCalAdrURIs )
+  X-ORIGIN 'RFC 2739' )
 

--
Gitblit v1.10.0