martin: server/kolab/kolab kolab2.schema,1.14,1.15

[cvs at intevation.de]

Author: martin

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

Modified Files:
	kolab2.schema 
Log Message:
Martin K.: Add support for Client18 (user and group policies for invitations)


Index: kolab2.schema
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab2.schema,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kolab2.schema	9 Sep 2004 00:59:08 -0000	1.14
+++ kolab2.schema	19 Sep 2004 23:40:41 -0000	1.15
@@ -114,7 +114,7 @@
   SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
-# For group/resource kolab accounts
+# For user, group and resource Kolab accounts
 # Describes how to respond to invitations
 # We keep the attribute as a string, but actually it can only have one 
 # of the following values:
@@ -124,9 +124,12 @@
 #  ACT_REJECT_IF_CONFLICTS
 #  ACT_MANUAL_IF_CONFLICTS
 #  ACT_MANUAL
+# In addition one of these values may be prefixed with a primary email 
+# address followed by a colon like
+# user at domain.tld: ACT_ALWAYS_ACCEPT
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.4
-  NAME 'kolabResourceAction'
-  DESC 'Used by group and resource accounts to determine how to respond'
+  NAME ( 'kolabResourceAction' 'kolabInvitationPolicy' )
+  DESC 'Used by user, group and resource accounts to determine how to respond to invitations'
   EQUALITY caseIgnoreIA5Match
   SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )