Updated schema.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14197 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/contrib/openldap/gosa-samba3.ldif b/gosa-core/contrib/openldap/gosa-samba3.ldif
index c33a7cfadf88941b262fb4ab9ba57f4f3df4004a..d47b004a4edbb07251b8aa6c9c14cffe0f0dbf9e 100644 (file)
--- a/gosa-core/contrib/openldap/gosa-samba3.ldif
+++ b/gosa-core/contrib/openldap/gosa-samba3.ldif
@@ -45,22 +45,23 @@ olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.12.41 NAME 'gosaVacationStart' DESC '
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.12.42 NAME 'gosaVacationStop' DESC 'Timestamp for switching off current vacation message' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.12.43 NAME 'gosaApplicationPriority' DESC 'Keeps the application icon in png format' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.12.44 NAME 'gotoLastSystemLogin' DESC 'Timestamp for a Users last System Login' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
-olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.12.45 NAME 'gotoLastSystem' DESC 'The DN of the System where the Login was performed' EQUALITY distinguishedNameMatch SYNTAX  1.3.6.1.4.1.1466.115.121.1.12)
+olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.12.45 NAME 'gotoLastSystem' EQUALITY distinguishedNameMatch DESC 'The DN of the System where the Login was performed' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12)
+olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.12.46 NAME 'gosaLoginRestriction' DESC 'Multivalue attribute to carry a number of allowed ips/subnets' SUP name)
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.6.2 NAME 'academicTitle' DESC 'Field to represent the academic title' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 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.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.1 NAME 'gosaObject' SUP top AUXILIARY DESC 'Class 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 'Class 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 'Class 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 'Class 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 '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))
+olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY DESC 'Class for GOsa Accounts (v2.6.6)' MUST ( uid ) MAY ( sambaLMPassword $ sambaNTPassword $ sambaPwdLastSet $ gosaDefaultPrinter $ gosaDefaultLanguage $ academicTitle $ personalTitle $ gosaHostACL $ dateOfBirth $ sambaBadPasswordCount $ sambaBadPasswordTime $ gender $ gotoLastSystemLogin $ gotoLastSystem $ gosaLoginRestriction ))
+olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.7 NAME 'gosaHost' SUP top AUXILIARY DESC 'Class 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 'Class 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 'Class 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 'Class 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 'Class 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 ))