gunnar: server/kolabd/kolabd kolab2.schema,1.37,1.38
cvs at kolab.org
cvs at kolab.org
Wed Jul 8 12:26:08 CEST 2009
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv23257/kolabd
Modified Files:
kolab2.schema
Log Message:
Fix broken commits on the kolab schema.
Index: kolab2.schema
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- kolab2.schema 22 Jun 2009 13:18:42 -0000 1.37
+++ kolab2.schema 8 Jul 2009 10:26:06 -0000 1.38
@@ -1,7 +1,7 @@
# $Id$
-# (c) 2003-2004 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-# (c) 2003-2009 Martin Konold <martin.konold at erfrakon.de>
-# (c) 2003 Achim Frank <achim.frank at erfrakon.de>
+# (c) 2003, 2004 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+# (c) 2003-2009 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
# modification, are permitted provided that the following conditions are met:
@@ -332,15 +332,6 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.19414.1.1.1.19
- NAME 'kolabSalutation'
- DESC 'Salutation like Mr., Mrs, Herr, Frau)'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{64} )
-
-
attributetype ( 1.3.6.1.4.1.19414.1.1.1.20
NAME 'kolabMaritalStatus'
DESC 'ledig(0), verh.(1)} DEFAULT ledig'
@@ -351,7 +342,7 @@
attributetype ( 1.3.6.1.4.1.19414.1.1.1.21
NAME ( 'homeFacsimileTelephoneNumber' 'homeFaxNumber' )
DESC 'private facsimilie telephone number'
- SUP telephoneNumber )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.50{32} )
attributetype ( 1.3.6.1.4.1.19414.1.1.1.25
NAME 'bylawURI'
@@ -395,7 +386,7 @@
attributetype ( 1.3.6.1.4.1.19414.1.1.1.31
NAME 'inLiquidation'
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 )
attributetype ( 1.3.6.1.4.1.19414.1.1.1.32
NAME 'tradeRegisterRegisteredCapital'
@@ -450,19 +441,19 @@
SUP name )
# describes the allowed or disallowed smtp addresses for
-# receiving. If this attribute is not set for a user no
-# kolab recieving address policy does apply.
+# recipients. If this attribute is not set for a user no
+# kolab recipient policy does apply.
# example entries:
-# .tld - allow mail from every sender for this tld
-# domain.tld - allow mail from everyone in domain.tld
-# .domain.tld - allow mail from everyone in domain.tld and its subdomains
-# user at domain.tld - allow mail from explicit user at domain.tld
-# user@ - allow mail from this user but any domain
-# -.tld - disallow mail from every sender for this tld
-# -domain.tld - disallow mail from everyone in domain.tld
-# -.domain.tld - disallow mail from everyone in domain.tld and its subdomains
-# -user at domain.tld - disallow mail from explicit user at domain.tld
-# -user@ - disallow mail from this user but any domain
+# .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.19414.1.1.1.43
NAME 'kolabAllowSMTPFrom'
@@ -471,6 +462,13 @@
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{512} )
+attributetype ( 1.3.6.1.4.1.19414.1.1.1.44
+ NAME 'kolabSalutation'
+ DESC 'Salutation like Mr., Mrs, Herr, Frau)'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{64} )
+
# kolabFolderType describes the kind of Kolab folder
# as defined in the kolab format specification.
# We will annotate all folders with an entry
@@ -741,19 +739,19 @@
attributetype ( 1.3.6.1.4.1.19414.2.1.1001
NAME 'externalPop3AccountDescription'
DESC 'a human readable description of the external POP3 account e.g. my gmail account'
- SUP description
- SINGLE-VALUE )
+ SINGLE-VALUE
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
attributetype ( 1.3.6.1.4.1.19414.2.1.1002
NAME 'externalPop3AccountMail'
DESC 'email address associated with the external POP3 account e.g. givenname.surname at gmail.com'
- SUP mail )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
attributetype ( 1.3.6.1.4.1.19414.2.1.1003
NAME 'externalPop3AccountServer'
DESC 'Pop3 server associated with the external POP3 account e.g. pop3.provider.com'
- SUP fqdnhostname
- SINGLE-VALUE )
+ SINGLE-VALUE
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
attributetype ( 1.3.6.1.4.1.19414.2.1.1004
NAME 'externalPop3AccountPort'
@@ -787,8 +785,8 @@
attributetype ( 1.3.6.1.4.1.19414.2.1.1008
NAME 'externalPop3AccountLoginName'
DESC 'name used to login into pop3 account often this uid is equivalent to the email address'
- SUP uid
- SINGLE-VALUE )
+ SINGLE-VALUE
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
attributetype ( 1.3.6.1.4.1.19414.2.1.1009
NAME 'externalPop3EncryptedAccountPassword'
@@ -810,6 +808,108 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} )
########################
+# external definitions #
+########################
+
+# extended from apple.schema
+attributetype ( 1.3.6.1.4.1.63.1000.1.1.1.1.27
+ NAME ( 'apple-birthday' 'dateOfBirth' 'dateOfIncorporation' )
+ DESC 'Birthday or date of incorporation'
+ EQUALITY generalizedTimeMatch
+ SUBSTR caseExactIA5SubstringsMatch
+ SINGLE-VALUE
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
+
+# from http://www.stroeder.com/stroeder.com.schema
+attributetype ( 1.3.6.1.4.1.5427.1.389.4.12
+ NAME ( 'birthPlace' 'placeOfBirth' )
+ DESC 'Place of birth'
+ SUP name
+ SINGLE-VALUE )
+
+# from http://www.stroeder.com/stroeder.com.schema
+attributetype ( 1.3.6.1.4.1.5427.1.389.4.14
+ NAME 'birthName'
+ DESC 'Last name at time of birth, e.g. maiden name'
+ SUP name
+ SINGLE-VALUE )
+
+# from http://www.stroeder.com/stroeder.com.schema
+# The following data items and codes are used (see ISO 5218):
+# Not known 0
+# Male 1
+# Female 2
+# Not specified 9
+#
+attributetype ( 1.3.6.1.4.1.5427.1.389.4.7
+ NAME 'gender'
+ DESC 'Representation of human sex (see ISO 5218)'
+ EQUALITY integerMatch
+ SINGLE-VALUE
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27{1} )
+
+# from http://www.stroeder.com/stroeder.com.schema
+# tax ID of person or company within Germany
+#
+attributetype ( 1.3.6.1.4.1.5427.1.389.4.666
+ NAME 'germanTaxId'
+ DESC 'tax ID of person or company within Germany'
+ EQUALITY caseIgnoreMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{20} )
+
+# rfc 3039
+# ISO 3166 Country Code
+# multiple citizenships are possible!
+attributetype ( 1.3.6.1.5.5.7.9.4
+ NAME 'countryOfCitizenship'
+ DESC 'Country of citizenship'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.11 )
+
+# ISO 3166 Country Code
+attributetype ( 1.3.6.1.5.5.7.9.5
+ NAME 'countryOfResidence'
+ DESC 'Country of residence'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.11 )
+
+# http://www.daasi.de/
+attributetype ( 1.3.6.1.4.1.5062.1.1.3.16
+ NAME 'legalForm'
+ DESC 'legal form of a company'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SINGLE-VALUE
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+
+# http://www.daasi.de/
+# location of the trade register authority
+attributetype ( 1.3.6.1.4.1.5062.1.1.3.17
+ NAME 'tradeRegisterLocation'
+ DESC 'Location of the trade registrar where the organization is registered'
+ SUP name
+ SINGLE-VALUE )
+
+# http://www.daasi.de/
+# registration number a the trade register authority
+attributetype ( 1.3.6.1.4.1.5062.1.1.3.18
+ NAME 'tradeRegisterIdentifier'
+ DESC 'Idientifier with which an organization is registered'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SINGLE-VALUE
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+
+# https://forxa.mancomun.org/plugins/scmsvn/viewcvs.php/trunk/ldap/dxpisi.schema?annotate=29&root=mancomun
+# VATNumber
+# Identifier number for companies and persons. In Spain it is the same as NIF/CIF.
+# In Germany it is called Umsatzsteueridentifikationsnummer.
+attributetype ( 1.3.6.1.4.1.27994.1.3.4
+ NAME 'VATNumber'
+ DESC 'Identifier number for companies and persons'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{10} )
+
+########################
# kolab object classes #
########################
@@ -926,6 +1026,7 @@
placeOfBirth $
birthName $
gender $
+ homeFacsimileTelephoneNumber $
countryOfCitizenship $
countryOfResidence $
legalForm $
@@ -975,8 +1076,8 @@
DESC 'kolab fetch messages via POP3 from external sources'
SUP top STRUCTURAL
MUST ( externalPop3AccountServer $
- externalPop3AccountLoginName $
- externalPop3EncryptedAccountPassword )
+ externalPop3AccountLoginName $
+ externalPop3EncryptedAccountPassword )
MAY ( externalPop3AccountDescription $
externalPop3AccountMail $
externalPop3AccountPort $
More information about the commits
mailing list