summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2007-07-27 15:38:19 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2007-07-27 15:38:19 (GMT)
commitaaa5a98f486568a7779cca3a5ee7839802673dd3 (patch)
treef005df83e29b0b0b1cab3d63304d27c6f492a9d0
parent746a8bee3ddd9a89c9e0f4b2a5701108b6d08a32 (diff)
downloadkolab-schema-aaa5a98f486568a7779cca3a5ee7839802673dd3.tar.gz
Reverted kolabAllowSMTPRecipient changes for kolab_2_2_branch:
cvs diff -u -d -r1.19 -r1.20 kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in|patch -p0 -s -R cvs diff -u -d -r1.13 -r1.14 kolabd/kolabd/templates/slapd.conf.template.in|patch -p0 -s -R cvs diff -u -d -r1.22 -r1.24 kolabd/kolabd/kolab2.schema|patch -p0 -s -R
-rw-r--r--kolab2.schema78
1 files changed, 24 insertions, 54 deletions
diff --git a/kolab2.schema b/kolab2.schema
index 7d44def..acf24e7 100644
--- a/kolab2.schema
+++ b/kolab2.schema
@@ -1,23 +1,23 @@
# $Id$
# (c) 2003, 2004 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
-# (c) 2003-2007 Martin Konold <martin.konold@erfrakon.de>
+# (c) 2003-2006 Martin Konold <martin.konold@erfrakon.de>
# (c) 2003 Achim Frank <achim.frank@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 @@ attributetype ( 1.3.6.1.4.1.19419.1.1.1.3
# 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 @@ attributetype ( 1.3.6.1.4.1.19419.1.1.1.7
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 @@ attributetype ( 1.3.6.1.4.1.19419.1.1.1.15
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,27 +296,6 @@ attributetype ( 1.3.6.1.4.1.19419.1.1.1.17
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.
-# example entries:
-# .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@domain.tld - allow mail to explicit user@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@domain.tld - disallow mail to explicit user@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
@@ -384,7 +363,7 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.506
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
@@ -514,13 +493,6 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.752
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 #
######################
@@ -546,7 +518,7 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.903
# 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
@@ -575,7 +547,6 @@ objectclass ( 1.3.6.1.4.1.19414.2.2.1
kolabfilter-verify-from-header $
kolabfilter-allow-sender-header $
kolabfilter-reject-forged-from-header $
- kolabPolicyDaemon $
proftpd-ftp $
proftpd-defaultquota $
kolabFreeBusyFuture $
@@ -640,7 +611,6 @@ objectclass ( 1.3.6.1.4.1.19414.3.2.2
kolabForwardAddress $
kolabForwardKeepCopy $
kolabForwardUCE $
- kolabAllowSMTPRecipient $
kolabDeleteflag $
kolabComment ) )
@@ -665,15 +635,15 @@ objectclass ( 1.3.6.1.4.1.19414.3.2.4
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@kolabdomain (e.g. employees@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@kolabdomain (e.g. employees@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 ) )