Martin Konold: Add support for EQUALITY and SUBSTRING

1 files changed, 44 insertions, 20 deletions

diff --git a/kolab2.schema b/kolab2.schema
index 5bc79ba..354fdea 100644
--- a/kolab2.schema
+++ b/kolab2.schema
@@ -46,8 +46,8 @@
 # a big ldap directory
 attributetype ( 1.3.6.1.4.1.19414.2.1.1
   NAME ( 'k' 'kolab' )
-  SUP name
-  DESC 'Kolab attribute' )
+  DESC 'Kolab attribute'
+  SUP name )
 
 # kolabDeleteflag used to be a boolean but describes with Kolab 2 
 # the fqdn of the server which is requested to delete this objects
@@ -80,6 +80,8 @@ attributetype ( 1.3.6.1.4.1.19419.2.1.4
 attributetype ( 1.3.6.1.4.1.19414.2.1.5
   NAME ( 'fqhostname' 'fqdnhostname' )
   DESC 'Fully qualified Hostname including full domain component'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # fqdn of all hosts in a multi-location setup
@@ -166,35 +168,49 @@ attributetype ( 1.3.6.1.4.1.19419.1.1.1.7
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.501
   NAME 'postfix-mydomain'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.502
   NAME 'postfix-relaydomains'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.503
   NAME 'postfix-mydestination'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.504
   NAME 'postfix-mynetworks'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.505
   NAME 'postfix-relayhost'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.506
   NAME 'postfix-transport'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 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 )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.508
-        NAME 'postfix-allow-unauthenticated'
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+  NAME 'postfix-allow-unauthenticated'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 ##########################
 # cyrus imapd attributes #
@@ -202,58 +218,65 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.508
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.601
   NAME 'cyrus-autocreatequota'
+  EQUALITY integerMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.602
   NAME 'cyrus-admins'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # enable plain imap without ssl 
 attributetype ( 1.3.6.1.4.1.19414.2.1.603
   NAME 'cyrus-imap'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  EQUALITY booleanMatch )
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # enable legacy pop3
 attributetype ( 1.3.6.1.4.1.19414.2.1.604
   NAME 'cyrus-pop3'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  EQUALITY booleanMatch )
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # user specific quota on the cyrus imap server
 attributetype ( 1.3.6.1.4.1.19414.2.1.605
   NAME 'cyrus-userquota'
   DESC 'Mailbox hard quota limit in MB'
+  EQUALITY integerMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
 # cyrus imapd access control list
 # acls work with users and groups
 attributetype ( 1.3.6.1.4.1.19414.2.1.651
   NAME 'acl'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # enable secure imap 
 attributetype ( 1.3.6.1.4.1.19414.2.1.606
   NAME 'cyrus-imaps'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  EQUALITY booleanMatch )
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # enable secure pop3
 attributetype ( 1.3.6.1.4.1.19414.2.1.607
   NAME 'cyrus-pop3s'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  EQUALITY booleanMatch )
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # enable sieve support (required for forward and vacation services)
 attributetype ( 1.3.6.1.4.1.19414.2.1.608
   NAME 'cyrus-sieve'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  EQUALITY booleanMatch )
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # installation wide percentage which determines when to send a 
 # warning to the user
 attributetype ( 1.3.6.1.4.1.19414.2.1.609
   NAME 'cyrus-quotawarn'
+  EQUALITY integerMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
 #############################
@@ -263,14 +286,14 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.609
 # enable plain http (no ssl)
 attributetype ( 1.3.6.1.4.1.19414.2.1.701
   NAME 'apache-http'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  EQUALITY booleanMatch )
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # Allow freebusy download without authenticating first
 attributetype ( 1.3.6.1.4.1.19414.2.1.702
   NAME 'apache-allow-unauthenticated-fb'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  EQUALITY booleanMatch )
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 ######################
 # proftpd attributes #
@@ -278,12 +301,13 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.702
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.901
   NAME 'proftpd-defaultquota'
+  EQUALITY integerMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.902
   NAME 'proftpd-ftp'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  EQUALITY booleanMatch )
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.903
   NAME 'proftpd-userPassword'