From: cajus Date: Fri, 28 Nov 2008 12:34:38 +0000 (+0000) Subject: Moved all oc's to version 2.6.1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=92aa8a1186c10ecbc3f433695eb3f1066b4ddc10;p=gosa.git Moved all oc's to version 2.6.1 git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13071 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/contrib/openldap/gosa-samba2.ldif b/gosa-core/contrib/openldap/gosa-samba2.ldif index 7cb5899d8..77b9034ee 100644 --- a/gosa-core/contrib/openldap/gosa-samba2.ldif +++ b/gosa-core/contrib/openldap/gosa-samba2.ldif @@ -50,25 +50,25 @@ olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.6.2 NAME 'academicTitle' DESC 'Field olcAttributeTypes: ( 1.3.6.1.4.1.15305.2.1 NAME ( 'gender' 'sex' ) DESC 'Gender: M for male, F for female' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1} SINGLE-VALUE ) olcAttributeTypes: ( 1.3.6.1.4.1.15305.2.2 NAME ( 'dateOfBirth' 'dob' ) DESC 'Date of birth in ISO 8601 format' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{10} SINGLE-VALUE ) olcAttributeTypes: ( 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} ) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.1 NAME 'gosaObject' SUP top AUXILIARY DESC 'Objectclass for GOsa settings (v2.4)' MUST ( gosaSubtreeACL )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.2 NAME 'gosaLockEntry' SUP top STRUCTURAL DESC 'Objectclass for GOsa locking (v2.4)' MUST ( gosaUser $ gosaObject $ cn )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTURAL DESC 'Objectclass for GOsa caching (v2.4)' MAY ( gosaUser ) MUST ( cn )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY DESC 'Objectclass to mark Departments for GOsa (v2.4)' MUST ( ou $ description )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.5 NAME 'gosaMailAccount' SUP top AUXILIARY DESC 'Objectclass to mark MailAccounts for GOsa (v2.4)' MUST ( mail $ gosaMailServer $ gosaMailDeliveryMode) MAY ( gosaMailQuota $ gosaMailAlternateAddress $ gosaMailForwardingAddress $ gosaMailMaxSize $ gosaSpamSortLevel $ gosaSpamMailbox $ gosaVacationMessage $ gosaVacationStart $ gosaVacationStop $ gosaSharedFolderTarget $ acl)) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY DESC 'Objectclass for GOsa Accounts (v2.4)' MUST ( uid ) MAY ( lmPassword $ ntPassword $ pwdLastSet $ gosaDefaultPrinter $ gosaDefaultLanguage $ academicTitle $ personalTitle $ gosaHostACL $ dateOfBirth $ gender $ gotoLastSystemLogin $ gotoLastSystem )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.7 NAME 'gosaHost' SUP top AUXILIARY DESC 'Objectclass for GOsa Hosts (v2.4)' MUST ( cn ) MAY ( description $ gosaService )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.8 NAME 'gosaProxyAccount' SUP top AUXILIARY DESC 'Objectclass for GOsa Proxy settings (v2.4)' MUST ( gosaProxyAcctFlags ) MAY ( gosaProxyID $ gosaProxyWorkingStart $ gosaProxyWorkingStop $ gosaProxyQuota $ gosaProxyQuotaPeriod )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.9 NAME 'gosaApplication' SUP top STRUCTURAL DESC 'Objectclass for GOsa applications (v2.4)' MUST ( cn $ gosaApplicationExecute ) MAY ( gosaApplicationName $ gosaApplicationIcon $ gosaApplicationFlags $ gosaApplicationMimeType $ gosaApplicationParameter $ gotoLogonScript $ description $ gosaApplicationCategory )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.10 NAME 'gosaApplicationGroup' SUP top AUXILIARY DESC 'Objectclass for GOsa application groups (v2.4)' MUST ( cn ) MAY ( gosaMemberApplication $ gosaApplicationParameter )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate' SUP top AUXILIARY DESC 'Objectclass for GOsa User Templates (v2.4)' MUST ( cn )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.12 NAME 'gosaGroupOfNames' DESC 'GOsa object grouping (v2.4)' SUP top STRUCTURAL MUST ( cn $ gosaGroupObjects ) MAY ( description $ member ) ) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount' DESC 'GOsa webdav enabling account (v2.4)' SUP top AUXILIARY MUST ( cn $ uid )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.14 NAME 'gosaIntranetAccount' DESC 'GOsa Intarent enabling account (v2.4)' SUP top AUXILIARY MUST ( cn $ uid ) MAY ( gosaDefaultLanguage )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.15 NAME 'gosaAdministrativeUnit' DESC 'Marker for administrational units (v2.5)' SUP top AUXILIARY MUST ( gosaUnitTag )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.16 NAME 'gosaAdministrativeUnitTag' DESC 'Marker for objects below administrational units (v2.5)' SUP top AUXILIARY MUST ( gosaUnitTag )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.17 NAME 'gosaRole' DESC 'ACL container to define roles (v2.5)' SUP top STRUCTURAL MUST ( gosaAclTemplate $ cn ) MAY ( description ) ) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.18 NAME 'gosaAcl' DESC 'ACL container to define single ACLs (v2.5)' SUP top AUXILIARY MUST ( gosaAclEntry )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject' DESC 'Container object for undo and snapshot data (v2.5)' SUP top STRUCTURAL MUST ( gosaSnapshotType $ gosaSnapshotTimestamp $ gosaSnapshotDN $ gosaSnapshotData ) MAY ( description ) ) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.1 NAME 'gosaObject' SUP top AUXILIARY DESC 'Objectclass for GOsa settings (v2.6.1)' MUST ( gosaSubtreeACL )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.2 NAME 'gosaLockEntry' SUP top STRUCTURAL DESC 'Objectclass for GOsa locking (v2.6.1)' MUST ( gosaUser $ gosaObject $ cn )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTURAL DESC 'Objectclass for GOsa caching (v2.6.1)' MAY ( gosaUser ) MUST ( cn )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY DESC 'Objectclass to mark Departments for GOsa (v2.6.1)' MUST ( ou $ description )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.5 NAME 'gosaMailAccount' SUP top AUXILIARY DESC 'Objectclass to mark MailAccounts for GOsa (v2.6.1)' MUST ( mail $ gosaMailServer $ gosaMailDeliveryMode) MAY ( gosaMailQuota $ gosaMailAlternateAddress $ gosaMailForwardingAddress $ gosaMailMaxSize $ gosaSpamSortLevel $ gosaSpamMailbox $ gosaVacationMessage $ gosaVacationStart $ gosaVacationStop $ gosaSharedFolderTarget $ acl)) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY DESC 'Objectclass for GOsa Accounts (v2.6.1)' MUST ( uid ) MAY ( lmPassword $ ntPassword $ pwdLastSet $ gosaDefaultPrinter $ gosaDefaultLanguage $ academicTitle $ personalTitle $ gosaHostACL $ dateOfBirth $ gender $ gotoLastSystemLogin $ gotoLastSystem )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.7 NAME 'gosaHost' SUP top AUXILIARY DESC 'Objectclass for GOsa Hosts (v2.6.1)' MUST ( cn ) MAY ( description $ gosaService )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.8 NAME 'gosaProxyAccount' SUP top AUXILIARY DESC 'Objectclass for GOsa Proxy settings (v2.6.1)' MUST ( gosaProxyAcctFlags ) MAY ( gosaProxyID $ gosaProxyWorkingStart $ gosaProxyWorkingStop $ gosaProxyQuota $ gosaProxyQuotaPeriod )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.9 NAME 'gosaApplication' SUP top STRUCTURAL DESC 'Objectclass for GOsa applications (v2.6.1)' MUST ( cn $ gosaApplicationExecute ) MAY ( gosaApplicationName $ gosaApplicationIcon $ gosaApplicationFlags $ gosaApplicationMimeType $ gosaApplicationParameter $ gotoLogonScript $ description $ gosaApplicationCategory )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.10 NAME 'gosaApplicationGroup' SUP top AUXILIARY DESC 'Objectclass for GOsa application groups (v2.6.1)' MUST ( cn ) MAY ( gosaMemberApplication $ gosaApplicationParameter )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate' SUP top AUXILIARY DESC 'Objectclass for GOsa User Templates (v2.6.1)' MUST ( cn )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.12 NAME 'gosaGroupOfNames' DESC 'GOsa object grouping (v2.6.1)' SUP top STRUCTURAL MUST ( cn $ gosaGroupObjects ) MAY ( description $ member ) ) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount' DESC 'GOsa webdav enabling account (v2.6.1)' SUP top AUXILIARY MUST ( cn $ uid )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.14 NAME 'gosaIntranetAccount' DESC 'GOsa Intarent enabling account (v2.6.1)' SUP top AUXILIARY MUST ( cn $ uid ) MAY ( gosaDefaultLanguage )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.15 NAME 'gosaAdministrativeUnit' DESC 'Marker for administrational units (v2.6.1)' SUP top AUXILIARY MUST ( gosaUnitTag )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.16 NAME 'gosaAdministrativeUnitTag' DESC 'Marker for objects below administrational units (v2.6.1)' SUP top AUXILIARY MUST ( gosaUnitTag )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.17 NAME 'gosaRole' DESC 'ACL container to define roles (v2.6.1)' SUP top STRUCTURAL MUST ( gosaAclTemplate $ cn ) MAY ( description ) ) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.18 NAME 'gosaAcl' DESC 'ACL container to define single ACLs (v2.6.1)' SUP top AUXILIARY MUST ( gosaAclEntry )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject' DESC 'Container object for undo and snapshot data (v2.6.1)' SUP top STRUCTURAL MUST ( gosaSnapshotType $ gosaSnapshotTimestamp $ gosaSnapshotDN $ gosaSnapshotData ) MAY ( description ) ) olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.20 NAME 'gosaConfig' DESC 'Settings for gosa. Replaces parts of the gosa.conf. (v2.6)' SUP top STRUCTURAL MAY ( gosaSetting ) ) olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.43 NAME 'gotoSubmenuEntry' DESC 'GOto - contains environment settings (v2.6)' SUP top STRUCTURAL MUST ( cn ) MAY ( gosaApplicationIcon $ gosaApplicationPriority ) ) olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.44 NAME 'gotoMenuEntry' DESC 'GOto - defines a menu entry (v2.6)' SUP top STRUCTURAL MUST ( cn ) MAY ( gosaApplicationParameter $ gosaApplicationPriority ) ) diff --git a/gosa-core/contrib/openldap/gosa-samba2.schema b/gosa-core/contrib/openldap/gosa-samba2.schema index b0abb9dd3..80c2a8182 100644 --- a/gosa-core/contrib/openldap/gosa-samba2.schema +++ b/gosa-core/contrib/openldap/gosa-samba2.schema @@ -288,99 +288,99 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.651 # Classes objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.1 NAME 'gosaObject' SUP top AUXILIARY - DESC 'Class for GOsa settings (v2.4)' + DESC 'Class for GOsa settings (v2.6.1)' MUST ( gosaSubtreeACL )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.2 NAME 'gosaLockEntry' SUP top STRUCTURAL - DESC 'Class for GOsa locking (v2.4)' + DESC 'Class for GOsa locking (v2.6.1)' MUST ( gosaUser $ gosaObject $ cn )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTURAL - DESC 'Class for GOsa caching (v2.4)' + DESC 'Class for GOsa caching (v2.6.1)' MAY ( gosaUser ) MUST ( cn )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY - DESC 'Class to mark Departments for GOsa (v2.4)' + DESC 'Class to mark Departments for GOsa (v2.6.1)' MUST ( ou $ description )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.5 NAME 'gosaMailAccount' SUP top AUXILIARY - DESC 'Class to mark MailAccounts for GOsa (v2.4)' + DESC 'Class to mark MailAccounts for GOsa (v2.6.1)' MUST ( mail $ gosaMailServer $ gosaMailDeliveryMode) MAY ( gosaMailQuota $ gosaMailAlternateAddress $ gosaMailForwardingAddress $ gosaMailMaxSize $ gosaSpamSortLevel $ gosaSpamMailbox $ gosaVacationMessage $ gosaVacationStart $ gosaVacationStop $ gosaSharedFolderTarget $ acl)) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY - DESC 'Class for GOsa Accounts (v2.4)' + DESC 'Class for GOsa Accounts (v2.6.1)' MUST ( uid ) MAY ( lmPassword $ ntPassword $ pwdLastSet $ gosaDefaultPrinter $ gosaDefaultLanguage $ academicTitle $ personalTitle $ gosaHostACL $ dateOfBirth $ gender $ gotoLastSystemLogin $ gotoLastSystem )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.7 NAME 'gosaHost' SUP top AUXILIARY - DESC 'Class for GOsa Hosts (v2.4)' + DESC 'Class for GOsa Hosts (v2.6.1)' MUST ( cn ) MAY ( description $ gosaService )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.8 NAME 'gosaProxyAccount' SUP top AUXILIARY - DESC 'Class for GOsa Proxy settings (v2.4)' + DESC 'Class for GOsa Proxy settings (v2.6.1)' MUST ( gosaProxyAcctFlags ) MAY ( gosaProxyID $ gosaProxyWorkingStart $ gosaProxyWorkingStop $ gosaProxyQuota $ gosaProxyQuotaPeriod )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.9 NAME 'gosaApplication' SUP top STRUCTURAL - DESC 'Class for GOsa applications (v2.4)' + DESC 'Class for GOsa applications (v2.6.1)' MUST ( cn $ gosaApplicationExecute ) MAY ( gosaApplicationName $ gosaApplicationIcon $ gosaApplicationFlags $ gosaApplicationMimeType $ gosaApplicationParameter $ gotoLogonScript $ description $ gosaApplicationCategory )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.10 NAME 'gosaApplicationGroup' SUP top AUXILIARY - DESC 'Class for GOsa application groups (v2.4)' + DESC 'Class for GOsa application groups (v2.6.1)' MUST ( cn ) MAY ( gosaMemberApplication $ gosaApplicationParameter )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate' SUP top AUXILIARY - DESC 'Class for GOsa User Templates (v2.4)' + DESC 'Class for GOsa User Templates (v2.6.1)' MUST ( cn )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.12 NAME 'gosaGroupOfNames' - DESC 'GOsa object grouping (v2.4)' + DESC 'GOsa object grouping (v2.6.1)' SUP top STRUCTURAL MUST ( cn $ gosaGroupObjects ) MAY ( description $ member ) ) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount' - DESC 'GOsa webdav enabling account (v2.4)' + DESC 'GOsa webdav enabling account (v2.6.1)' SUP top AUXILIARY MUST ( cn $ uid )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.14 NAME 'gosaIntranetAccount' - DESC 'GOsa Intarent enabling account (v2.4)' + DESC 'GOsa Intarent enabling account (v2.6.1)' SUP top AUXILIARY MUST ( cn $ uid ) MAY ( gosaDefaultLanguage )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.15 NAME 'gosaAdministrativeUnit' - DESC 'Marker for administrational units (v2.5)' + DESC 'Marker for administrational units (v2.6.1)' SUP top AUXILIARY MUST ( gosaUnitTag )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.16 NAME 'gosaAdministrativeUnitTag' - DESC 'Marker for objects below administrational units (v2.5)' + DESC 'Marker for objects below administrational units (v2.6.1)' SUP top AUXILIARY MUST ( gosaUnitTag )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.17 NAME 'gosaRole' - DESC 'ACL container to define roles (v2.5)' SUP top STRUCTURAL + DESC 'ACL container to define roles (v2.6.1)' SUP top STRUCTURAL MUST ( gosaAclTemplate $ cn ) MAY ( description ) ) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.18 NAME 'gosaAcl' - DESC 'ACL container to define single ACLs (v2.5)' SUP top AUXILIARY + DESC 'ACL container to define single ACLs (v2.6.1)' SUP top AUXILIARY MUST ( gosaAclEntry )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject' - DESC 'Container object for undo and snapshot data (v2.5)' SUP top STRUCTURAL + DESC 'Container object for undo and snapshot data (v2.6.1)' SUP top STRUCTURAL MUST ( gosaSnapshotType $ gosaSnapshotTimestamp $ gosaSnapshotDN $ gosaSnapshotData ) MAY ( description ) ) diff --git a/gosa-core/contrib/openldap/gosa-samba3.ldif b/gosa-core/contrib/openldap/gosa-samba3.ldif index 9aa965744..e2edab245 100644 --- a/gosa-core/contrib/openldap/gosa-samba3.ldif +++ b/gosa-core/contrib/openldap/gosa-samba3.ldif @@ -50,25 +50,25 @@ olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.6.2 NAME 'academicTitle' DESC 'Field olcAttributeTypes: ( 1.3.6.1.4.1.15305.2.1 NAME ( 'gender' 'sex' ) DESC 'Gender: M for male, F for female' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1} SINGLE-VALUE ) olcAttributeTypes: ( 1.3.6.1.4.1.15305.2.2 NAME ( 'dateOfBirth' 'dob' ) DESC 'Date of birth in ISO 8601 format' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{10} SINGLE-VALUE ) olcAttributeTypes: ( 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} ) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.1 NAME 'gosaObject' SUP top AUXILIARY DESC 'Objectclass for GOsa settings (v2.4)' MUST ( gosaSubtreeACL )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.2 NAME 'gosaLockEntry' SUP top STRUCTURAL DESC 'Objectclass for GOsa locking (v2.4)' MUST ( gosaUser $ gosaObject $ cn )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTURAL DESC 'Objectclass for GOsa caching (v2.4)' MAY ( gosaUser ) MUST ( cn )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY DESC 'Objectclass to mark Departments for GOsa (v2.4)' MUST ( ou $ description )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.5 NAME 'gosaMailAccount' SUP top AUXILIARY DESC 'Objectclass to mark MailAccounts for GOsa (v2.4)' MUST ( mail $ gosaMailServer $ gosaMailDeliveryMode) MAY ( gosaMailQuota $ gosaMailAlternateAddress $ gosaMailForwardingAddress $ gosaMailMaxSize $ gosaSpamSortLevel $ gosaSpamMailbox $ gosaVacationMessage $ gosaVacationStart $ gosaVacationStop $ gosaSharedFolderTarget $ acl)) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY DESC 'Objectclass for GOsa Accounts (v2.4)' MUST ( uid ) MAY ( sambaLMPassword $ sambaNTPassword $ sambaPwdLastSet $ gosaDefaultPrinter $ gosaDefaultLanguage $ academicTitle $ personalTitle $ gosaHostACL $ dateOfBirth $ sambaBadPasswordCount $ sambaBadPasswordTime $ gender $ gotoLastSystemLogin $ gotoLastSystem )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.7 NAME 'gosaHost' SUP top AUXILIARY DESC 'Objectclass for GOsa Hosts (v2.4)' MUST ( cn ) MAY ( description $ gosaService )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.8 NAME 'gosaProxyAccount' SUP top AUXILIARY DESC 'Objectclass for GOsa Proxy settings (v2.4)' MUST ( gosaProxyAcctFlags ) MAY ( gosaProxyID $ gosaProxyWorkingStart $ gosaProxyWorkingStop $ gosaProxyQuota $ gosaProxyQuotaPeriod )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.9 NAME 'gosaApplication' SUP top STRUCTURAL DESC 'Objectclass for GOsa applications (v2.4)' MUST ( cn $ gosaApplicationExecute ) MAY ( gosaApplicationName $ gosaApplicationIcon $ gosaApplicationFlags $ gosaApplicationMimeType $ gosaApplicationParameter $ gotoLogonScript $ description $ gosaApplicationCategory )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.10 NAME 'gosaApplicationGroup' SUP top AUXILIARY DESC 'Objectclass for GOsa application groups (v2.4)' MUST ( cn ) MAY ( gosaMemberApplication $ gosaApplicationParameter )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate' SUP top AUXILIARY DESC 'Objectclass for GOsa User Templates (v2.4)' MUST ( cn )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.12 NAME 'gosaGroupOfNames' DESC 'GOsa object grouping (v2.4)' SUP top STRUCTURAL MUST ( cn $ gosaGroupObjects ) MAY ( member $ description ) ) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount' DESC 'GOsa webdav enabling account (v2.4)' SUP top AUXILIARY MUST ( cn $ uid )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.14 NAME 'gosaIntranetAccount' DESC 'GOsa Inatrent enabling account (v2.4)' SUP top AUXILIARY MUST ( cn $ uid ) MAY ( gosaDefaultLanguage )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.15 NAME 'gosaAdministrativeUnit' DESC 'Marker for administrational units (v2.5)' SUP top AUXILIARY MUST ( gosaUnitTag )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.16 NAME 'gosaAdministrativeUnitTag' DESC 'Marker for objects below administrational units (v2.5)' SUP top AUXILIARY MUST ( gosaUnitTag )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.17 NAME 'gosaRole' DESC 'ACL container to define roles (v2.5)' SUP top STRUCTURAL MUST ( gosaAclTemplate $ cn ) MAY ( description ) ) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.18 NAME 'gosaAcl' DESC 'ACL container to define single ACLs (v2.5)' SUP top AUXILIARY MUST ( gosaAclEntry )) -olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject' DESC 'Container object for undo and snapshot data (v2.5)' SUP top STRUCTURAL MUST ( gosaSnapshotType $ gosaSnapshotTimestamp $ gosaSnapshotDN $ gosaSnapshotData ) MAY ( description ) ) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.1 NAME 'gosaObject' SUP top AUXILIARY DESC 'Objectclass for GOsa settings (v2.6.1)' MUST ( gosaSubtreeACL )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.2 NAME 'gosaLockEntry' SUP top STRUCTURAL DESC 'Objectclass for GOsa locking (v2.6.1)' MUST ( gosaUser $ gosaObject $ cn )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTURAL DESC 'Objectclass for GOsa caching (v2.6.1)' MAY ( gosaUser ) MUST ( cn )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY DESC 'Objectclass to mark Departments for GOsa (v2.6.1)' MUST ( ou $ description )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.5 NAME 'gosaMailAccount' SUP top AUXILIARY DESC 'Objectclass to mark MailAccounts for GOsa (v2.6.1)' MUST ( mail $ gosaMailServer $ gosaMailDeliveryMode) MAY ( gosaMailQuota $ gosaMailAlternateAddress $ gosaMailForwardingAddress $ gosaMailMaxSize $ gosaSpamSortLevel $ gosaSpamMailbox $ gosaVacationMessage $ gosaVacationStart $ gosaVacationStop $ gosaSharedFolderTarget $ acl)) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY DESC 'Objectclass for GOsa Accounts (v2.6.1)' MUST ( uid ) MAY ( sambaLMPassword $ sambaNTPassword $ sambaPwdLastSet $ gosaDefaultPrinter $ gosaDefaultLanguage $ academicTitle $ personalTitle $ gosaHostACL $ dateOfBirth $ sambaBadPasswordCount $ sambaBadPasswordTime $ gender $ gotoLastSystemLogin $ gotoLastSystem )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.7 NAME 'gosaHost' SUP top AUXILIARY DESC 'Objectclass for GOsa Hosts (v2.6.1)' MUST ( cn ) MAY ( description $ gosaService )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.8 NAME 'gosaProxyAccount' SUP top AUXILIARY DESC 'Objectclass for GOsa Proxy settings (v2.6.1)' MUST ( gosaProxyAcctFlags ) MAY ( gosaProxyID $ gosaProxyWorkingStart $ gosaProxyWorkingStop $ gosaProxyQuota $ gosaProxyQuotaPeriod )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.9 NAME 'gosaApplication' SUP top STRUCTURAL DESC 'Objectclass for GOsa applications (v2.6.1)' MUST ( cn $ gosaApplicationExecute ) MAY ( gosaApplicationName $ gosaApplicationIcon $ gosaApplicationFlags $ gosaApplicationMimeType $ gosaApplicationParameter $ gotoLogonScript $ description $ gosaApplicationCategory )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.10 NAME 'gosaApplicationGroup' SUP top AUXILIARY DESC 'Objectclass for GOsa application groups (v2.6.1)' MUST ( cn ) MAY ( gosaMemberApplication $ gosaApplicationParameter )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate' SUP top AUXILIARY DESC 'Objectclass for GOsa User Templates (v2.6.1)' MUST ( cn )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.12 NAME 'gosaGroupOfNames' DESC 'GOsa object grouping (v2.6.1)' SUP top STRUCTURAL MUST ( cn $ gosaGroupObjects ) MAY ( member $ description ) ) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount' DESC 'GOsa webdav enabling account (v2.6.1)' SUP top AUXILIARY MUST ( cn $ uid )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.14 NAME 'gosaIntranetAccount' DESC 'GOsa Inatrent enabling account (v2.6.1)' SUP top AUXILIARY MUST ( cn $ uid ) MAY ( gosaDefaultLanguage )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.15 NAME 'gosaAdministrativeUnit' DESC 'Marker for administrational units (v2.6.1)' SUP top AUXILIARY MUST ( gosaUnitTag )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.16 NAME 'gosaAdministrativeUnitTag' DESC 'Marker for objects below administrational units (v2.6.1)' SUP top AUXILIARY MUST ( gosaUnitTag )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.17 NAME 'gosaRole' DESC 'ACL container to define roles (v2.6.1)' SUP top STRUCTURAL MUST ( gosaAclTemplate $ cn ) MAY ( description ) ) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.18 NAME 'gosaAcl' DESC 'ACL container to define single ACLs (v2.6.1)' SUP top AUXILIARY MUST ( gosaAclEntry )) +olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject' DESC 'Container object for undo and snapshot data (v2.6.1)' SUP top STRUCTURAL MUST ( gosaSnapshotType $ gosaSnapshotTimestamp $ gosaSnapshotDN $ gosaSnapshotData ) MAY ( description ) ) olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.20 NAME 'gosaConfig' DESC 'Settings for gosa. Replaces parts of the gosa.conf. (v2.6)' SUP top STRUCTURAL MAY ( gosaSetting ) ) olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.43 NAME 'gotoSubmenuEntry' DESC 'GOto - contains environment settings (v2.6)' SUP top STRUCTURAL MUST ( cn ) MAY ( gosaApplicationIcon $ gosaApplicationPriority ) ) olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.44 NAME 'gotoMenuEntry' DESC 'GOto - defines a menu entry (v2.6)' SUP top STRUCTURAL MUST ( cn ) MAY ( gosaApplicationParameter $ gosaApplicationPriority ) ) diff --git a/gosa-core/contrib/openldap/gosa-samba3.schema b/gosa-core/contrib/openldap/gosa-samba3.schema index 1637f53eb..fc06c9b7c 100644 --- a/gosa-core/contrib/openldap/gosa-samba3.schema +++ b/gosa-core/contrib/openldap/gosa-samba3.schema @@ -291,31 +291,31 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.651 # Classes objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.1 NAME 'gosaObject' SUP top AUXILIARY - DESC 'Class for GOsa settings (v2.4)' + DESC 'Class for GOsa settings (v2.6.1)' MUST ( gosaSubtreeACL )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.2 NAME 'gosaLockEntry' SUP top STRUCTURAL - DESC 'Class for GOsa locking (v2.4)' + DESC 'Class for GOsa locking (v2.6.1)' MUST ( gosaUser $ gosaObject $ cn )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTURAL - DESC 'Class for GOsa caching (v2.4)' + DESC 'Class for GOsa caching (v2.6.1)' MAY ( gosaUser ) MUST ( cn )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY - DESC 'Class to mark Departments for GOsa (v2.4)' + DESC 'Class to mark Departments for GOsa (v2.6.1)' MUST ( ou $ description )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.5 NAME 'gosaMailAccount' SUP top AUXILIARY - DESC 'Class to mark MailAccounts for GOsa (v2.4)' + DESC 'Class to mark MailAccounts for GOsa (v2.6.1)' MUST ( mail $ gosaMailServer $ gosaMailDeliveryMode) MAY ( gosaMailQuota $ gosaMailAlternateAddress $ gosaMailForwardingAddress $ gosaMailMaxSize $ gosaSpamSortLevel $ gosaSpamMailbox $ gosaVacationMessage $ gosaVacationStart $ gosaVacationStop $ gosaSharedFolderTarget $ acl)) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY - DESC 'Class for GOsa Accounts (v2.4)' + DESC 'Class for GOsa Accounts (v2.6.1)' MUST ( uid ) MAY ( sambaLMPassword $ sambaNTPassword $ sambaPwdLastSet $ gosaDefaultPrinter $ gosaDefaultLanguage $ academicTitle $ personalTitle $ gosaHostACL $ dateOfBirth $ @@ -323,68 +323,68 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY gotoLastSystemLogin $ gotoLastSystem )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.7 NAME 'gosaHost' SUP top AUXILIARY - DESC 'Class for GOsa Hosts (v2.4)' + DESC 'Class for GOsa Hosts (v2.6.1)' MUST ( cn ) MAY ( description $ gosaService )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.8 NAME 'gosaProxyAccount' SUP top AUXILIARY - DESC 'Class for GOsa Proxy settings (v2.4)' + DESC 'Class for GOsa Proxy settings (v2.6.1)' MUST ( gosaProxyAcctFlags ) MAY ( gosaProxyID $ gosaProxyWorkingStart $ gosaProxyWorkingStop $ gosaProxyQuota $ gosaProxyQuotaPeriod )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.9 NAME 'gosaApplication' SUP top STRUCTURAL - DESC 'Class for GOsa applications (v2.4)' + DESC 'Class for GOsa applications (v2.6.1)' MUST ( cn $ gosaApplicationExecute ) MAY ( gosaApplicationName $ gosaApplicationIcon $ gosaApplicationFlags $ gosaApplicationMimeType $ gosaApplicationParameter $ gotoLogonScript $ description $ gosaApplicationCategory )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.10 NAME 'gosaApplicationGroup' SUP top AUXILIARY - DESC 'Class for GOsa application groups (v2.4)' + DESC 'Class for GOsa application groups (v2.6.1)' MUST ( cn ) MAY ( gosaMemberApplication $ gosaApplicationParameter )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate' SUP top AUXILIARY - DESC 'Class for GOsa User Templates (v2.4)' + DESC 'Class for GOsa User Templates (v2.6.1)' MUST ( cn )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.12 NAME 'gosaGroupOfNames' - DESC 'GOsa object grouping (v2.4)' + DESC 'GOsa object grouping (v2.6.1)' SUP top STRUCTURAL MUST ( cn $ gosaGroupObjects ) MAY ( member $ description ) ) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount' - DESC 'GOsa webdav enabling account (v2.4)' + DESC 'GOsa webdav enabling account (v2.6.1)' SUP top AUXILIARY MUST ( cn $ uid )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.14 NAME 'gosaIntranetAccount' - DESC 'GOsa Inatrent enabling account (v2.4)' + DESC 'GOsa Inatrent enabling account (v2.6.1)' SUP top AUXILIARY MUST ( cn $ uid ) MAY ( gosaDefaultLanguage )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.15 NAME 'gosaAdministrativeUnit' - DESC 'Marker for administrational units (v2.5)' + DESC 'Marker for administrational units (v2.6.1)' SUP top AUXILIARY MUST ( gosaUnitTag )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.16 NAME 'gosaAdministrativeUnitTag' - DESC 'Marker for objects below administrational units (v2.5)' + DESC 'Marker for objects below administrational units (v2.6.1)' SUP top AUXILIARY MUST ( gosaUnitTag )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.17 NAME 'gosaRole' - DESC 'ACL container to define roles (v2.5)' SUP top STRUCTURAL + DESC 'ACL container to define roles (v2.6.1)' SUP top STRUCTURAL MUST ( gosaAclTemplate $ cn ) MAY ( description ) ) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.18 NAME 'gosaAcl' - DESC 'ACL container to define single ACLs (v2.5)' SUP top AUXILIARY + DESC 'ACL container to define single ACLs (v2.6.1)' SUP top AUXILIARY MUST ( gosaAclEntry )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject' - DESC 'Container object for undo and snapshot data (v2.5)' SUP top STRUCTURAL + DESC 'Container object for undo and snapshot data (v2.6.1)' SUP top STRUCTURAL MUST ( gosaSnapshotType $ gosaSnapshotTimestamp $ gosaSnapshotDN $ gosaSnapshotData ) MAY ( description ) )