Martin K.: Schema directly derived from RFC 2739 for handling calendars/fb in LDAP. Currently we only use the attribute calFBURL for our purposes

2 files changed, 124 insertions, 81 deletions

diff --git a/kolab2.schema b/kolab2.schema
index 58084a9..7693389 100644
--- a/kolab2.schema
+++ b/kolab2.schema
@@ -101,8 +101,8 @@ attributetype ( 1.3.6.1.4.1.19419.1.1.1.1
 # flag for allowing unrestriced length of mails
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.2
   NAME 'unrestrictedMailSize'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  EQUALITY booleanMatch )
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # allow delegates to act in your name (vacation/secretary boss use case)
 # we use the syntax of rfc822 email addresses in order identify 
@@ -134,7 +134,13 @@ attributetype ( 1.3.6.1.4.1.19419.1.1.1.4
   SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
-
+# time span from now to the future used for the free busy data
+# measured in days
+attributetype ( 1.3.6.1.4.1.19419.1.1.1.5
+  NAME 'kolabFreeBusyDuration'
+  DESC 'time in days for fb data'
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
 ######################
 # postfix attributes #
@@ -325,10 +331,12 @@ objectclass ( 1.3.6.1.4.1.19414.3.2.2
         unrestrictedMailSize $
         kolabDelegate $
         kolabEncryptedPassword $
-        kolabDeleteflag $
         alias $
 	cyrus-userquota $
-	kolabInvitationPolicy ) )
+	kolabInvitationPolicy $
+        kolabFreeBusyDuration $
+        calFBURL $
+        kolabDeleteflag ) )
 
 # kolab organization with country support
 objectclass ( 1.3.6.1.4.1.19414.3.2.3 
@@ -349,6 +357,7 @@ objectclass ( 1.3.6.1.4.1.19414.3.2.4
         mail $
         kolabDeleteflag $
         alias ) )
+
 # kolab groupOfNames with extra kolabDeleteflag
 objectclass ( 1.3.6.1.4.1.19414.3.2.5 
   NAME 'kolabGroupOfNames'
diff --git a/rfc2739.schema b/rfc2739.schema
index 406aa8d..5525fc7 100644
--- a/rfc2739.schema
+++ b/rfc2739.schema
@@ -1,98 +1,132 @@
+# (c) 2004 Martin Konold <martin.konold@erfrakon.de>
+
+# This schema is derived from RFC 2739 and may act as a substitute
+#
+# Copyright (C) The Internet Society (2000).  All Rights Reserved.
 #
-# http://www.faqs.org/rfcs/rfc2739.html
-# 
-# From the RFC:
-# The calCalURI contains the URI to a snapshot of the user's entire
-# default calendar. The calFBURL contains the URI to the user's default
-# busy time data. The calCAPURI represents contains a URI that can be
-# used to communicate with the user's calendar. The calCalAdrURI
-# contains a URI that points to the location to which event requests
-# should be sent for that user.
+#  This document and translations of it may be copied and furnished to
+#  others, and derivative works that comment on or otherwise explain it
+#  or assist in its implementation may be prepared, copied, published
+#  and distributed, in whole or in part, without restriction of any
+#  kind, provided that the above copyright notice and this paragraph are
+#  included on all such copies and derivative works.  However, this
+#  document itself may not be modified in any way, such as by removing
+#  the copyright notice or references to the Internet Society or other
+#  Internet organizations, except as needed for the purpose of
+#  developing Internet standards in which case the procedures for
+#  copyrights defined in the Internet Standards process must be
+#  followed, or as required to translate it into languages other than
+#  English.
 #
-# The calOtherCalURIs is a multi-valued property containing URIs to
-# snapshots of other calendars that the user may have. The
-# calOtherFBURLs is a multi-valued property containing URIs to other
-# free/busy data that the user may have. The calOtherCAPURIs attribute
-# is a multi-valued property containing URIs to other calendars that
-# the user may have. The calOtherCalAdrURIs attribute is a multi-valued
-# property containing URIs to other locations that a user may want
-# event requests sent to.
+#  The limited permissions granted above are perpetual and will not be
+#  revoked by the Internet Society or its successors or assigns.
 #
-# There is no predetermined order to the values in either multi-valued
-# property.
+#  This document and the information contained herein is provided on an
+#  "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+#  TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+#  BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+#  HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+#  MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 
-#	EQUALITY caseIgnoreIA5Match
+# slapd.conf then looks like
+#  include /kolab/etc/openldap/schema/core.schema
+#  include /kolab/etc/openldap/schema/cosine.schema
+#  include /kolab/local/etc/openldap/schema/inetorgperson.schema
+#  include /kolab/local/etc/openldap/schema/rfc2739.schema
+#  include /kolab/local/etc/openldap/schema/kolab2.schema
+
+#
+################################
+# rfc 2739 calendar attributes #
+################################
 
-attribute (1.2.840.113556.1.4.478
+# contains the URI to a snapshot of the user's entire
+# default calendar
+attributetype (1.2.840.113556.1.4.478
   NAME 'calCalURI'
-  DESC 'Snapshot of users entire default calendar'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
- )
+  DESC 'RFC2739: URI of entire default calendar'
+  EQUALITY caseIgnoreMatch
+  SUBSTRING caseIgnoreMatch
+  SYNTAX 'IA5String'
+  USAGE userApplications )
 
-attribute (1.2.840.113556.1.4.479
+# contains the URI to the user's default
+# busy time data
+attributetype (1.2.840.113556.1.4.479
   NAME 'calFBURL'
-  DESC 'URI of the uses free and busy information'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
- )
+  DESC 'RFC2739: URI to the users default freebusy data'
+  EQUALITY caseIgnoreMatch
+  SUBSTRING caseIgnoreMatch
+  SYNTAX 'IA5String'
+  USAGE userApplications )
 
-attribute (1.2.840.113556.1.4.480
+# contains a URI that can be used to communicate with 
+# the user's calendar
+attributetype (1.2.840.113556.1.4.480
   NAME 'calCAPURI'
-  DESC 'URI used to communicate with the users calendar'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
- )
+  DESC 'RFC2739: URI used to communicate with the users calendar'
+  EQUALITY caseIgnoreMatch
+  SUBSTRING caseIgnoreMatch
+  SYNTAX 'IA5String'
+  USAGE userApplications )
 
-attribute (1.2.840.113556.1.4.481
+# contains a URI that points to the location to which event
+# requests should be sent for that user
+attributetype (1.2.840.113556.1.4.481
   NAME 'calCalAdrURI'
-  DESC 'URI to which event requests should be sent for the user'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
- )
+  DESC 'RFC2739: URI for event equests destination'
+  EQUALITY caseIgnoreMatch
+  SUBSTRING caseIgnoreMatch
+  SYNTAX 'IA5String'
+  USAGE userApplications )
 
-attribute (1.2.840.113556.1.4.482
+# multi-valued property containing URIs to snapshots of 
+# other calendars that the user may have
+attributetype (1.2.840.113556.1.4.482
   NAME 'calOtherCalURIs'
-  DESC 'URIs to non-default calendars belonging to the user'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
- )
+  DESC 'RFC2739: multi-value URI for snapshots of other calendars'
+  EQUALITY caseIgnoreMatch
+  SUBSTRING caseIgnoreMatch
+  SYNTAX 'IA5String'
+  MULTI-VALUE
+  USAGE userApplications )
 
-attribute (1.2.840.113556.1.4.483
+# multi-valued property containing URIs to snapshots of other 
+# free/busy data that the user may have
+attributetype (1.2.840.113556.1.4.483
   NAME 'calOtherFBURLs'
-  DESC 'URIs to non-default free and busy information files'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
- )
+  DESC 'RFC2739: multi-value URI for other free/busy data'
+  EQUALITY caseIgnoreMatch
+  SUBSTRING caseIgnoreMatch
+  SYNTAX 'IA5String'
+  MULTI-VALUE
+  USAGE userApplications )
 
-attribute (1.2.840.113556.1.4.484
+# multi-valued property containing URI to other calendars that
+# the user may have
+attributetype (1.2.840.113556.1.4.484
   NAME 'calOtherCAPURIs'
-  DESC 'URIs for communicating with non-default calendars'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
- )
+  DESC 'RFC2739: multi-value URI to other calendars'
+  EQUALITY caseIgnoreMatch
+  SUBSTRING caseIgnoreMatch
+  SYNTAX 'IA5String'
+  MULTI-VALUE
+  USAGE userApplications )
 
-attribute (1.2.840.113556.1.4.485
+#  URIs to other locations that a user may want
+#   event requests sent to
+attributetype (1.2.840.113556.1.4.485
   NAME 'calOtherCalAdrURIs'
-  DESC 'Destinations for event requests to non-default calendars'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
- )
+  DESC 'RFC2739: multi-value URI to other request destinations'
+  EQUALITY caseIgnoreMatch
+  SUBSTRING caseIgnoreMatch
+  SYNTAX 'IA5String'
+  MULTI-VALUE
+  USAGE userApplications )
 
 objectclass (1.2.840.113556.1.5.87
- NAME 'calEntry' 
- DESC 'Calendering and Free Busy information'
- SUP top AUXILIARY
- MAY (calCalURI $ calFBURL $ calCAPURI $ calCalAdrURI $ 
-      calOtherCalURIs $ calOtherFBURLs $ calOtherCAPURIs $
-      calOtherCalAdrURIs
-     )
- )
+  NAME 'calEntry'
+  DESC 'RFC2739: Calendar Entry'
+  SUP top AUXILIARY
+  MAY (calCalURI calFBURL calOtherCalURIs calOtherFBURLs calCAPURI
+  calOtherCAPURLs ) )