steffen: server/kolabd/kolabd kolab2.schema,1.9,1.10

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	kolab2.schema 
Log Message:
Moved kolabfilter settings verify_from and allow_sender to LDAP

Index: kolab2.schema
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolab2.schema	29 May 2005 22:43:44 -0000	1.9
+++ kolab2.schema	6 Jun 2005 23:46:16 -0000	1.10
@@ -302,6 +302,23 @@
   EQUALITY booleanMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
+##########################
+# kolabfilter attributes #
+##########################
+
+# enable trustable From:
+attributetype ( 1.3.6.1.4.1.19414.2.1.750
+  NAME 'kolabfilter-verify-from-header'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+
+# should Sender header be allowed instead of From
+# when present?
+attributetype ( 1.3.6.1.4.1.19414.2.1.751
+  NAME 'kolabfilter-allow-sender-header'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+
 ######################
 # proftpd attributes #
 ######################
@@ -332,7 +349,7 @@
   DESC 'Kolab server configuration'
   SUP top STRUCTURAL
   MUST k
-  MAY (	kolabHost $
+  MAY ( kolabHost $
         postfix-mydomain $
         postfix-relaydomains $
         postfix-mydestination $
@@ -341,7 +358,7 @@
         postfix-transport $
         postfix-virtual $
         postfix-enable-virus-scan $
-	postfix-allow-unauthenticated $
+        postfix-allow-unauthenticated $
         cyrus-autocreatequota $
         cyrus-quotawarn $
         cyrus-autocreatequota $
@@ -352,7 +369,9 @@
         cyrus-pop3s $
         cyrus-sieve $
         apache-http $
-	apache-allow-unauthenticated-fb $
+        apache-allow-unauthenticated-fb $
+        kolabfilter-verify-from-header $
+        kolabfilter-allow-sender-header $
         proftpd-ftp $
         proftpd-defaultquota $
         kolabFreeBusyFuture $
@@ -392,13 +411,13 @@
   SUP top AUXILIARY
   MAY ( c $
         alias $
-	kolabHomeServer $
+        kolabHomeServer $
         kolabHomeMTA $
         unrestrictedMailSize $
         kolabDelegate $
         kolabEncryptedPassword $
-	cyrus-userquota $
-	kolabInvitationPolicy $
+        cyrus-userquota $
+        kolabInvitationPolicy $
         kolabFreeBusyFuture $
         calFBURL $
         kolabDeleteflag ) )