steffen: server/kolab/kolab kolab.schema, 1.9, 1.10 slapd.conf.template, 1.17, 1.18
cvs at intevation.de
cvs at intevation.de
Wed May 19 18:36:22 CEST 2004
- Previous message: steffen: server/kolab/kolab/admin/statistics filelister.php, 1.2, NONE head.php, 1.4, NONE index.php, 1.6, NONE kolab.php, 1.5, NONE load.php, 1.5, NONE mta.php, 1.5, NONE
- Next message: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/templates/en vacation.tpl, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: steffen
Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv4448
Modified Files:
kolab.schema slapd.conf.template
Log Message:
merged in schema from concept paper
Index: kolab.schema
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab.schema,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolab.schema 18 Apr 2004 02:51:41 -0000 1.9
+++ kolab.schema 19 May 2004 16:36:20 -0000 1.10
@@ -262,7 +262,7 @@
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
+
attributetype ( 0.9.2342.19200300.100.1.37
NAME 'associatedDomain'
DESC 'RFC1274: domain associated with object'
@@ -614,7 +614,6 @@
NAME 'postfix-enable-virus-scan'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
# imapd specific attributes
attributetype ( 1.3.6.1.4.1.19414.2.1.601
@@ -659,8 +658,8 @@
EQUALITY booleanMatch )
attributetype ( 1.3.6.1.4.1.19414.2.1.609
- NAME 'cyrus-quotawarn'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+ NAME 'cyrus-quotawarn'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
# apache2 and php specific attributes
attributetype ( 1.3.6.1.4.1.19414.2.1.701
@@ -669,7 +668,6 @@
EQUALITY booleanMatch )
# proftpd specific attributes
-
attributetype ( 1.3.6.1.4.1.19414.2.1.901
NAME 'proftpd-defaultquota'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
@@ -682,11 +680,29 @@
attributetype ( 1.3.6.1.4.1.19414.2.1.903
NAME 'proftpd-userPassword'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+
+attributetype ( 1.3.6.1.4.1.19419.1.1.1.1
+ NAME 'homeServer'
+ DESC 'mailbox host'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+
+attributetype ( 1.3.6.1.4.1.19419.1.1.1.2
+ NAME 'unrestrictedMailSize'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ EQUALITY booleanMatch )
+
+attributetype ( 1.3.6.1.4.1.19419.1.1.1.3
+ NAME 'delegate'
+ DESC 'Kolab delegate RFC822 Mailbox/Alias'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
########################
# kolab object classes #
########################
-
objectclass ( 1.3.6.1.4.1.19414.2.2.1 NAME 'kolab'
DESC 'Kolab server config'
MUST k
@@ -698,9 +714,10 @@
postfix-mynetworks $
postfix-relayhost $
postfix-transport $
- postfix-enable-virus-scan $
- cyrus-autocreatequota $
- cyrus-quotawarn $
+ postfix-enable-virus-scan $
+ cyrus-autocreatequota $
+ cyrus-quotawarn $
+ cyrus-autocreatequota $
cyrus-admins $
cyrus-imap $
cyrus-pop3 $
@@ -723,10 +740,6 @@
SUP top STRUCTURAL
MAY cn )
-##################
-# object classes #
-##################
-
objectclass ( 2.5.6.2 NAME 'country'
DESC 'RFC2256: a country'
SUP top STRUCTURAL
@@ -778,16 +791,16 @@
postalAddress $ physicalDeliveryOfficeName $ ou $ st $ l $
c $ userquota $ deleteflag ) )
-#objectclass ( 2.5.6.8 NAME 'organizationalRole'
-# DESC 'RFC2256: an organizational role'
-# SUP top STRUCTURAL
-# MUST cn
-# MAY ( x121Address $ registeredAddress $ destinationIndicator $
-# preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
-# telephoneNumber $ internationaliSDNNumber $ facsimileTelephoneNumber $
-# seeAlso $ roleOccupant $ preferredDeliveryMethod $ street $
-# postOfficeBox $ postalCode $ postalAddress $
-# physicalDeliveryOfficeName $ ou $ st $ l $ description ) )
+objectclass ( 2.5.6.8 NAME 'organizationalRole'
+ DESC 'RFC2256: an organizational role'
+ SUP top STRUCTURAL
+ MUST cn
+ MAY ( x121Address $ registeredAddress $ destinationIndicator $
+ preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
+ telephoneNumber $ internationaliSDNNumber $ facsimileTelephoneNumber $
+ seeAlso $ roleOccupant $ preferredDeliveryMethod $ street $
+ postOfficeBox $ postalCode $ postalAddress $
+ physicalDeliveryOfficeName $ ou $ st $ l $ description ) )
objectclass ( 2.5.6.9 NAME 'groupOfNames'
DESC 'RFC2256: a group of names (DNs)'
@@ -795,103 +808,61 @@
MUST ( cn )
MAY ( member $ businessCategory $ seeAlso $ owner $ ou $ o $ description $ deleteflag ) )
-#objectclass ( 2.5.6.10 NAME 'residentialPerson'
-# DESC 'RFC2256: an residential person'
-# SUP person STRUCTURAL
-# MUST l
-# MAY ( businessCategory $ x121Address $ registeredAddress $
-# destinationIndicator $ preferredDeliveryMethod $ telexNumber $
-# teletexTerminalIdentifier $ telephoneNumber $ internationaliSDNNumber $
-# facsimileTelephoneNumber $ preferredDeliveryMethod $ street $
-# postOfficeBox $ postalCode $ postalAddress $
-# physicalDeliveryOfficeName $ st $ l $ c $ deleteflag ) )
-
objectclass ( 2.5.6.11 NAME 'applicationProcess'
DESC 'RFC2256: an application process'
SUP top STRUCTURAL
MUST cn
MAY ( seeAlso $ ou $ l $ description ) )
-#objectclass ( 2.5.6.12 NAME 'applicationEntity'
-# DESC 'RFC2256: an application entity'
-# SUP top STRUCTURAL
-# MUST ( presentationAddress $ cn )
-# MAY ( supportedApplicationContext $ seeAlso $ ou $ o $ l $
-# description ) )
-
-#objectclass ( 2.5.6.13 NAME 'dSA'
-# DESC 'RFC2256: a directory system agent (a server)'
-# SUP applicationEntity STRUCTURAL
-# MAY knowledgeInformation )
-
-#objectclass ( 2.5.6.14 NAME 'device'
-# DESC 'RFC2256: a device'
-# SUP top STRUCTURAL
-# MUST cn
-# MAY ( serialNumber $ seeAlso $ owner $ ou $ o $ l $ description ) )
-
-#objectclass ( 2.5.6.15 NAME 'strongAuthenticationUser'
-# DESC 'RFC2256: a strong authentication user'
-# SUP top AUXILIARY
-# MUST userCertificate )
-
-#objectclass ( 2.5.6.16 NAME 'certificationAuthority'
-# DESC 'RFC2256: a certificate authority'
-# SUP top AUXILIARY
-# MUST ( authorityRevocationList $ certificateRevocationList $
-# cACertificate ) MAY crossCertificatePair )
-
-#objectclass ( 2.5.6.17 NAME 'groupOfUniqueNames'
-# DESC 'RFC2256: a group of unique names (DN and Unique Identifier)'
-# SUP top STRUCTURAL
-# MUST ( uniqueMember $ cn )
-# MAY ( businessCategory $ seeAlso $ owner $ ou $ o $ description ) )
+objectclass ( 2.5.6.12 NAME 'applicationEntity'
+ DESC 'RFC2256: an application entity'
+ SUP top STRUCTURAL
+ MUST ( presentationAddress $ cn )
+ MAY ( supportedApplicationContext $ seeAlso $ ou $ o $ l $
+ description ) )
-#objectclass ( 2.5.6.18 NAME 'userSecurityInformation'
-# DESC 'RFC2256: a user security information'
-# SUP top AUXILIARY
-# MAY ( supportedAlgorithms ) )
+objectclass ( 2.5.6.16 NAME 'certificationAuthority'
+ DESC 'RFC2256: a certificate authority'
+ SUP top AUXILIARY
+ MUST ( authorityRevocationList $ certificateRevocationList $
+ cACertificate ) MAY crossCertificatePair )
-#objectclass ( 2.5.6.16.2 NAME 'certificationAuthority-V2'
-# SUP certificationAuthority
-# AUXILIARY MAY ( deltaRevocationList ) )
+objectclass ( 2.5.6.17 NAME 'groupOfUniqueNames'
+ DESC 'RFC2256: a group of unique names (DN and Unique Identifier)'
+ SUP top STRUCTURAL
+ MUST ( uniqueMember $ cn )
+ MAY ( businessCategory $ seeAlso $ owner $ ou $ o $ description ) )
-#objectclass ( 2.5.6.19 NAME 'cRLDistributionPoint'
-# SUP top STRUCTURAL
-# MUST ( cn )
-# MAY ( certificateRevocationList $ authorityRevocationList $
-# deltaRevocationList ) )
+objectclass ( 2.5.6.16.2 NAME 'certificationAuthority-V2'
+ SUP certificationAuthority
+ AUXILIARY MAY ( deltaRevocationList ) )
-#objectclass ( 2.5.6.20 NAME 'dmd'
-# SUP top STRUCTURAL
-# MUST ( dmdName )
-# MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $
-# x121Address $ registeredAddress $ destinationIndicator $
-# preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
-# telephoneNumber $ internationaliSDNNumber $ facsimileTelephoneNumber $
-# street $ postOfficeBox $ postalCode $ postalAddress $
-# physicalDeliveryOfficeName $ st $ l $ description ) )
+objectclass ( 2.5.6.19 NAME 'cRLDistributionPoint'
+ SUP top STRUCTURAL
+ MUST ( cn )
+ MAY ( certificateRevocationList $ authorityRevocationList $
+ deltaRevocationList ) )
-#objectclass ( 2.5.6.21 NAME 'pkiUser'
-# DESC 'RFC2587: a PKI user'
-# SUP top AUXILIARY
-# MAY userCertificate )
+objectclass ( 2.5.6.21 NAME 'pkiUser'
+ DESC 'RFC2587: a PKI user'
+ SUP top AUXILIARY
+ MAY userCertificate )
-#objectclass ( 2.5.6.22 NAME 'pkiCA'
-# DESC 'RFC2587: PKI certificate authority'
-# SUP top AUXILIARY
-# MAY ( authorityRevocationList $ certificateRevocationList $
-# cACertificate $ crossCertificatePair ) )
+objectclass ( 2.5.6.22 NAME 'pkiCA'
+ DESC 'RFC2587: PKI certificate authority'
+ SUP top AUXILIARY
+ MAY ( authorityRevocationList $ certificateRevocationList $
+ cACertificate $ crossCertificatePair ) )
-#objectclass ( 2.5.6.23 NAME 'deltaCRL'
-# DESC 'RFC2587: PKI user'
-# SUP top AUXILIARY
-# MAY deltaRevocationList )
+objectclass ( 2.5.6.23 NAME 'deltaCRL'
+ DESC 'RFC2587: PKI user'
+ SUP top AUXILIARY
+ MAY deltaRevocationList )
-#objectclass ( 1.3.6.1.4.1.250.3.15 NAME 'labeledURIObject'
-# DESC 'RFC2079: object that contains the URI attribute type'
-# MAY ( labeledURI )
-# SUP top AUXILIARY )
+objectclass ( 1.3.6.1.4.1.250.3.15 NAME 'labeledURIObject'
+ DESC 'RFC2079: object that contains the URI attribute type'
+ MAY ( labeledURI )
+ SUP top AUXILIARY )
objectclass ( 0.9.2342.19200300.100.4.19 NAME 'simpleSecurityObject'
DESC 'RFC1274: simple security object'
@@ -906,33 +877,6 @@
DESC 'RFC2377: uid object'
SUP top AUXILIARY MUST uid )
-#objectclass ( 0.9.2342.19200300.100.4.4
-# NAME ( 'pilotPerson' 'newPilotPerson' )
-# SUP person STRUCTURAL
-# MAY ( userid $ textEncodedORAddress $ rfc822Mailbox $
-# favouriteDrink $ roomNumber $ userClass $
-# homeTelephoneNumber $ homePostalAddress $ secretary $
-# personalTitle $ preferredDeliveryMethod $ businessCategory $
-# janetMailbox $ otherMailbox $ mobileTelephoneNumber $
-# pagerTelephoneNumber $ organizationalStatus $
-# mailPreferenceOption $ personalSignature )
-# )
-
-#objectclass ( 0.9.2342.19200300.100.4.5 NAME 'account'
-# SUP top STRUCTURAL
-# MUST userid
-# MAY ( description $ seeAlso $ localityName $
-# organizationName $ organizationalUnitName $ host )
-# )
-
-#objectclass ( 0.9.2342.19200300.100.4.6 NAME 'document'
-# SUP top STRUCTURAL
-# MUST documentIdentifier
-# MAY ( commonName $ description $ seeAlso $ localityName $
-# organizationName $ organizationalUnitName $
-# documentTitle $ documentVersion $ documentAuthor $
-# documentLocation $ documentPublisher )
-# )
objectclass ( 0.9.2342.19200300.100.4.7 NAME 'room'
SUP top STRUCTURAL
@@ -940,13 +884,6 @@
MAY ( roomNumber $ description $ seeAlso $ telephoneNumber )
)
-#objectclass ( 0.9.2342.19200300.100.4.9 NAME 'documentSeries'
-# SUP top STRUCTURAL
-# MUST commonName
-# MAY ( description $ seeAlso $ telephonenumber $
-# localityName $ organizationName $ organizationalUnitName )
-# )
-
objectclass ( 0.9.2342.19200300.100.4.13 NAME 'domain'
SUP top STRUCTURAL
MUST domainComponent
@@ -961,45 +898,16 @@
registeredAddress $ x121Address )
)
-#objectclass ( 0.9.2342.19200300.100.4.14 NAME 'RFC822localPart'
-# SUP domain STRUCTURAL
-# MAY ( commonName $ surname $ description $ seeAlso $ telephoneNumber $
-# physicalDeliveryOfficeName $ postalAddress $ postalCode $
-# postOfficeBox $ streetAddress $
-# facsimileTelephoneNumber $ internationalISDNNumber $
-# telephoneNumber $ teletexTerminalIdentifier $
-# telexNumber $ preferredDeliveryMethod $ destinationIndicator $
-# registeredAddress $ x121Address )
-# )
-
-#objectclass ( 0.9.2342.19200300.100.4.15 NAME 'dNSDomain'
-# SUP 'domain' STRUCTURAL
-# MAY ( ARecord $ MDRecord $ MXRecord $ NSRecord $
-# SOARecord $ CNAMERecord )
-# )
-
-#objectclass ( 0.9.2342.19200300.100.4.17 NAME 'domainRelatedObject'
-# DESC 'RFC1274: an object related to an domain'
-# SUP top AUXILIARY
-# MUST associatedDomain )
-
-#objectclass ( 0.9.2342.19200300.100.4.18 NAME 'friendlyCountry'
-# SUP country STRUCTURAL
-# MUST friendlyCountryName )
-
-#objectclass ( 0.9.2342.19200300.100.4.20 NAME 'pilotOrganization'
-# SUP ( organization $ organizationalUnit ) STRUCTURAL
-# MAY buildingName )
-
-#objectclass ( 0.9.2342.19200300.100.4.21 NAME 'pilotDSA'
-# SUP dsa STRUCTURAL
-# MAY dSAQuality )
+objectclass ( 0.9.2342.19200300.100.4.15 NAME 'dNSDomain'
+ SUP 'domain' STRUCTURAL
+ MAY ( ARecord $ MDRecord $ MXRecord $ NSRecord $
+ SOARecord $ CNAMERecord )
+ )
-#objectclass ( 0.9.2342.19200300.100.4.22 NAME 'qualityLabelledData'
-# SUP top AUXILIARY
-# MUST dsaQuality
-# MAY ( subtreeMinimumQuality $ subtreeMaximumQuality )
-# )
+objectclass ( 0.9.2342.19200300.100.4.17 NAME 'domainRelatedObject'
+ DESC 'RFC1274: an object related to an domain'
+ SUP top AUXILIARY
+ MUST associatedDomain )
objectclass ( 2.16.840.1.113730.3.2.2
NAME 'inetOrgPerson'
@@ -1014,4 +922,15 @@
photo $ roomNumber $ secretary $ uid $ userCertificate $
x500uniqueIdentifier $ preferredLanguage $
userSMIMECertificate $ userPKCS12 $ deleteflag $ alias )
+ )
+
+objectclass ( 1.3.6.1.4.1.19414.3.2.2
+ NAME 'kInetOrgPerson'
+ DESC 'Kolab Internet Organizational Person'
+ SUP inetOrgPerson
+ STRUCTURAL
+ MAY (
+ homeServer $
+ unrestrictedMailSize $
+ delegate)
)
Index: slapd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/slapd.conf.template,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- slapd.conf.template 25 Apr 2004 22:15:25 -0000 1.17
+++ slapd.conf.template 19 May 2004 16:36:20 -0000 1.18
@@ -12,8 +12,6 @@
# the template is @l_prefix@/etc/kolab/slapd.conf.template
include @l_prefix@/etc/openldap/schema/kolab.schema
-include @l_prefix@/etc/openldap/schema/kolab-cf.schema
-
pidfile @l_prefix@/var/openldap/run/slapd.pid
replica-pidfile @l_prefix@/var/openldap/run/slurpd.pid
- Previous message: steffen: server/kolab/kolab/admin/statistics filelister.php, 1.2, NONE head.php, 1.4, NONE index.php, 1.6, NONE kolab.php, 1.5, NONE load.php, 1.5, NONE mta.php, 1.5, NONE
- Next message: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/templates/en vacation.tpl, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list