martin: server/kolab/kolab kolab2.schema,1.5,1.6

cvs at intevation.de cvs at intevation.de
Tue Aug 10 23:55:25 CEST 2004


Author: martin

Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv15104/kolab

Modified Files:
	kolab2.schema 
Log Message:
Martin K.: ws fixes and comments from jmdault. Now only kolabInetOrgPerson is left


Index: kolab2.schema
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab2.schema,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolab2.schema	10 Aug 2004 14:43:14 -0000	1.5
+++ kolab2.schema	10 Aug 2004 21:55:22 -0000	1.6
@@ -74,7 +74,7 @@
 
 # hostname including the domain name like kolab-master.bsi.de
 attributetype ( 1.3.6.1.4.1.19414.2.1.5
-  NAME 'fqhostname' 'fqdnhostname'
+  NAME ( 'fqhostname' 'fqdnhostname' )
   DESC 'Fully qualified Hostname including full domain component'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
@@ -231,7 +231,8 @@
 ########################
 
 # main kolab server configuration
-objectclass ( 1.3.6.1.4.1.19414.2.2.1 NAME 'kolab'
+objectclass ( 1.3.6.1.4.1.19414.2.2.1 
+  NAME 'kolab'
   DESC 'Kolab server configuration'
   SUP top STRUCTURAL
   MUST k
@@ -260,7 +261,8 @@
 
 # shared folders are typically visible to everyone subscribed to 
 # the server without the need for an extra login
-objectclass ( 1.3.6.1.4.1.19414.2.2.9 NAME 'kolabSharedfolder'
+objectclass ( 1.3.6.1.4.1.19414.2.2.9 
+  NAME 'kolabSharedfolder'
   DESC 'Kolab public shared folder'
   SUP top STRUCTURAL
   MUST cn
@@ -272,10 +274,10 @@
 # used as a plain node for the LDAP tree. In contrast to unix filesystem directories
 # LDAP nodes can and often do also have contents/attributes. We use kolabNamedObject
 # in order to put more structure in the directory tree.
-objectclass ( 1.3.6.1.4.1.5322.13.1.1 NAME 'kolabNamedObject'
+objectclass ( 1.3.6.1.4.1.5322.13.1.1 
+  NAME 'kolabNamedObject'
   SUP top STRUCTURAL
-  MAY cn
-)
+  MAY (cn $ ou) )
 
 # kolab account with country support
 objectclass ( 1.3.6.1.4.1.19414.3.2.2
@@ -283,7 +285,6 @@
   DESC 'Kolab Internet Organizational Person'
   SUP inetOrgPerson STRUCTURAL
   MAY ( kolabHomeServer $
-        
         c $
         unrestrictedMailSize $
         kolabDelegate $
@@ -293,7 +294,8 @@
 	userquota ) )
 
 # kolab organization with country support
-objectclass ( 1.3.6.1.4.1.19414.3.2.3 NAME 'kolabOrganization'
+objectclass ( 1.3.6.1.4.1.19414.3.2.3 
+  NAME 'kolabOrganization'
   DESC 'RFC2256: a Kolab organization'
   SUP organization STRUCTURAL
   MAY ( c $
@@ -302,15 +304,17 @@
         alias ) )
 
 # kolab organizational unit with country support
-objectclass ( 1.3.6.1.4.1.19414.3.2.4 NAME 'kolabOrganizationalUnit'
+objectclass ( 1.3.6.1.4.1.19414.3.2.4 
+  NAME 'kolabOrganizationalUnit'
   DESC 'a Kolab organizational unit'
   SUP organizationalUnit STRUCTURAL
   MAY ( c $
         mail $
         kolabDeleteflag $
         alias ) )
-
-objectclass ( 1.3.6.1.4.1.19414.3.2.5 NAME 'kolabGroupOfNames'
+# kolab groupOfNames with extra kolabDeleteflag
+objectclass ( 1.3.6.1.4.1.19414.3.2.5 
+  NAME 'kolabGroupOfNames'
   DESC 'Kolab group of names (DNs) derived from RFC2256'
   SUP groupOfNames STRUCTURAL
   MAY kolabDeleteflag )





More information about the commits mailing list