martin: server/kolabd/kolabd kolab2.schema,1.22,1.23

cvs at kolab.org cvs at kolab.org
Mon Jul 2 23:12:22 CEST 2007


Author: martin

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv22436

Modified Files:
	kolab2.schema 
Log Message:
Martin Konold: Add two new attributes 'kolabAllowSMTPRecipient' and 'kolabPolicyDaemon'. The former is added to kolabInetOrgPerson while the later is added to the kolab objectclass.
kolabAllowSMTPRecipient describes the allowed or disallowed smtp addresses for
recipients. If this attribute is not set for a user no kolab recipient policy does apply.

entry examples:
.tld             - allow mail to every recipient for this tld
domain.tld       - allow mail to everyone in domain.tld
.domain.tld      - allow mail to everyone in domain.tld and its subdomains
user at domain.tld  - allow mail to explicit user at domain.tld
user@            - allow mail to this user but any domain
-.tld            - disallow mail to every recipient for this tld
-domain.tld      - disallow mail to everyone in domain.tld
-.domain.tld     - disallow mail to everyone in domain.tld and its subdomains
-user at domain.tld - disallow mail to explicit user at domain.tld
-user@           - disallow mail to this user but any domain




Index: kolab2.schema
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- kolab2.schema	2 Feb 2007 15:16:45 -0000	1.22
+++ kolab2.schema	2 Jul 2007 21:12:20 -0000	1.23
@@ -1,23 +1,23 @@
 # $Id$
 # (c) 2003, 2004 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-# (c) 2003-2006  Martin Konold <martin.konold at erfrakon.de>
+# (c) 2003-2007  Martin Konold <martin.konold at erfrakon.de>
 # (c) 2003 Achim Frank <achim.frank at erfrakon.de>
 #
-# Redistribution and use in source and binary forms, with or without 
+# Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #
-# Redistributions of source code must retain the above copyright notice, this 
+# Redistributions of source code must retain the above copyright notice, this
 # list of conditions and the following disclaimer.
 #
-# Redistributions in binary form must reproduce the above copyright notice, 
-# this list of conditions and the following disclaimer in the documentation 
+# Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
 # and/or other materials provided with the distribution.
 #
-# The name of the author may not be used to endorse or promote products derived 
+# The name of the author may not be used to endorse or promote products derived
 # from this software without specific prior written permission.
 #
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
 # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
 # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -123,7 +123,7 @@
 
 # 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 
+# We keep the attribute as a string, but actually it can only have one
 # of the following values:
 #
 #  ACT_ALWAYS_ACCEPT
@@ -171,11 +171,11 @@
   SINGLE-VALUE )
 
 # Begin date of Kolab vacation period. Sender will
-# be notified every kolabVacationResendIntervall days 
+# be notified every kolabVacationResendIntervall days
 # that recipient is absent until kolabVacationEnd.
 # Values in this syntax are encoded as printable strings,
-# represented as specified in X.208. 
-# Note that the time zone must be specified. 
+# represented as specified in X.208.
+# Note that the time zone must be specified.
 # For Kolab we limit ourself to  GMT
 # YYYYMMDDHHMMZ e.g. 200512311458Z.
 # see also: rfc 2252.
@@ -270,7 +270,7 @@
   NAME 'kolabForwardKeepCopy'
   DESC 'Keep copy when forwarding'
   EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE )
 
 # Enable forwarding of UCE. 
@@ -296,6 +296,27 @@
   SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
 
+# describes the allowed or disallowed smtp addresses for 
+# recipients. If this attribute is not set for a user no
+# kolab recipient policy does apply.
+# entry examples:
+# .tld             - allow mail to every recipient for this tld
+# domain.tld       - allow mail to everyone in domain.tld
+# .domain.tld      - allow mail to everyone in domain.tld and its subdomains
+# user at domain.tld  - allow mail to explicit user at domain.tld
+# user@            - allow mail to this user but any domain
+# -.tld            - disallow mail to every recipient for this tld
+# -domain.tld      - disallow mail to everyone in domain.tld
+# -.domain.tld     - disallow mail to everyone in domain.tld and its subdomains
+# -user at domain.tld - disallow mail to explicit user at domain.tld
+# -user@           - disallow mail to this user but any domain
+attributetype ( 1.3.6.1.4.1.19419.1.1.1.18
+  NAME 'kolabAllowSMTPRecipient'
+  DESC 'SMTP address allowed for destination (multi-valued)'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{512} )
+
 # kolabFolderType describes the kind of Kolab folder
 # as defined in the kolab format specification. 
 # We will annotate all folders with an entry 
@@ -363,7 +384,7 @@
 attributetype ( 1.3.6.1.4.1.19414.2.1.507
   NAME 'postfix-enable-virus-scan'
   EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.508
@@ -493,6 +514,13 @@
   EQUALITY booleanMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
+# Enable the Kolab Policy Daemon. If false or not
+# set don't use the Kolab Policy Daemon
+attributetype ( 1.3.6.1.4.1.19414.2.1.800
+  NAME 'kolabPolicyDaemon'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+
 ######################
 # proftpd attributes #
 ######################
@@ -518,7 +546,7 @@
 # main kolab server configuration
 # storing global values and user specific default values
 # like kolabFreeBusyFuture and kolabFreeBusyPast
-objectclass ( 1.3.6.1.4.1.19414.2.2.1 
+objectclass ( 1.3.6.1.4.1.19414.2.2.1
   NAME 'kolab'
   DESC 'Kolab server configuration'
   SUP top STRUCTURAL
@@ -547,6 +575,7 @@
         kolabfilter-verify-from-header $
         kolabfilter-allow-sender-header $
         kolabfilter-reject-forged-from-header $
+        kolabPolicyDaemon $
         proftpd-ftp $
         proftpd-defaultquota $
         kolabFreeBusyFuture $
@@ -611,6 +640,7 @@
 	kolabForwardAddress $
 	kolabForwardKeepCopy $
         kolabForwardUCE $
+	kolabAllowSMTPRecipient $
         kolabDeleteflag $
         kolabComment ) )
 
@@ -635,15 +665,15 @@
         alias ) )
 
 # kolab groupOfNames with extra kolabDeleteflag and the required 
-# attribute mail.    
-# The mail attribute for kolab objects of the type kolabGroupOfNames 
-# is not arbitrary but MUST be a single attribute of the form 
+# attribute mail.
+# The mail attribute for kolab objects of the type kolabGroupOfNames
+# is not arbitrary but MUST be a single attribute of the form
 # of an valid SMTP address with the CN as the local part.
-# E.g cn at kolabdomain (e.g. employees at mydomain.com). The    
-# mail attribute MUST be globally unique.    
-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 ( mail $    
+# E.g cn at kolabdomain (e.g. employees at mydomain.com). The
+# mail attribute MUST be globally unique.
+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 ( mail $
         kolabDeleteflag ) )





More information about the commits mailing list