From 0dac3376ec6ca3dfa8b082b4d4e0ec1abb8c139b Mon Sep 17 00:00:00 2001 From: cajus Date: Tue, 17 May 2005 12:28:13 +0000 Subject: [PATCH] Update schema versions to 2.4 git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@228 594d385d-05f5-0310-b6e9-bd551577e9d8 --- contrib/openldap/goconfig.schema | 2 +- contrib/openldap/gohard.schema | 2 +- contrib/openldap/gosa+samba3.schema | 26 ++++++++-------- contrib/openldap/gosa.schema | 26 ++++++++-------- contrib/openldap/goserver.schema | 24 +++++++-------- include/setup_checks.inc | 46 ++++++++++++++--------------- 6 files changed, 63 insertions(+), 63 deletions(-) diff --git a/contrib/openldap/goconfig.schema b/contrib/openldap/goconfig.schema index 254d103a0..64fbf8498 100644 --- a/contrib/openldap/goconfig.schema +++ b/contrib/openldap/goconfig.schema @@ -37,7 +37,7 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.10.10 NAME 'goLogcheckCategory' # Logging object objectclass (1.3.6.1.4.1.10098.1.2.2.2 NAME 'goLogcheckObject' SUP top STRUCTURAL - DESC 'Logcheck rule container (v2.2)' + DESC 'Logcheck rule container (v2.4)' MUST ( cn $ goLogcheckCategory ) MAY ( goLogcheckMatch $ goLogcheckIgnoreMatch )) diff --git a/contrib/openldap/gohard.schema b/contrib/openldap/gohard.schema index 79ae3e3d5..a9c15eb36 100644 --- a/contrib/openldap/gohard.schema +++ b/contrib/openldap/gohard.schema @@ -75,7 +75,7 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.2.10 NAME 'ghInventoryNumber' # objectclass for Hardware definitions objectclass (1.3.6.1.4.1.10098.1.2.1.3 NAME 'GOhard' - DESC 'Gonicus Hardware definitions, objectclass (v2.1)' SUP top AUXILIARY + DESC 'Gonicus Hardware definitions, objectclass (v2.4)' SUP top AUXILIARY MUST ( cn ) MAY ( ghGfxAdapter $ ghNetNic $ ghSoundAdapter $ ghIdeDev $ ghScsiDev $ macAddress $ ghUsbSupport $ ghMemSize $ ghCpuType $ ghInventoryNumber ) ) diff --git a/contrib/openldap/gosa+samba3.schema b/contrib/openldap/gosa+samba3.schema index f8121840f..e32e3bcaa 100644 --- a/contrib/openldap/gosa+samba3.schema +++ b/contrib/openldap/gosa+samba3.schema @@ -208,69 +208,69 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.651 # Objectclasses objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.1 NAME 'gosaObject' AUXILIARY - DESC 'Objectclass for GOsa settings (v2.1)' + DESC 'Objectclass for GOsa settings (v2.4)' MUST ( gosaSubtreeACL )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.2 NAME 'gosaLockEntry' SUP top STRUCTURAL - DESC 'Objectclass for GOsa locking (v2.1)' + DESC 'Objectclass for GOsa locking (v2.4)' MUST ( gosaUser $ gosaObject $ cn )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTURAL - DESC 'Objectclass for GOsa caching (v2.1)' + DESC 'Objectclass for GOsa caching (v2.4)' MAY ( gosaUser ) MUST ( cn )) objectclass ( 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.1)' + DESC 'Objectclass to mark Departments for GOsa (v2.4)' MUST ( ou $ description )) objectclass ( 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.1)' + DESC 'Objectclass to mark MailAccounts for GOsa (v2.4)' MUST ( mail $ gosaMailServer $ gosaMailDeliveryMode) MAY ( gosaMailQuota $ gosaMailAlternateAddress $ gosaMailForwardingAddress $ gosaMailMaxSize $ gosaSpamSortLevel $ gosaSpamMailbox $ gosaVacationMessage $ gosaSharedFolderTarget $ acl)) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY - DESC 'Objectclass for GOsa Accounts (v2.1.2)' + DESC 'Objectclass for GOsa Accounts (v2.4)' MUST ( uid ) MAY ( sambaLMPassword $ sambaNTPassword $ sambaPwdLastSet $ gosaDefaultPrinter $ gosaDefaultLanguage $ academicTitle $ personalTitle $ gosaHostACL $ dateOfBirth $ sambaBadPasswordCount $ sambaBadPasswordTime $ gender )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.7 NAME 'gosaHost' SUP top AUXILIARY - DESC 'Objectclass for GOsa Hosts (v2.1)' + DESC 'Objectclass for GOsa Hosts (v2.4)' MUST ( cn ) MAY ( description $ gosaService )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.8 NAME 'gosaProxyAccount' SUP top AUXILIARY - DESC 'Objectclass for GOsa Proxy settings (v2.1.2)' + DESC 'Objectclass for GOsa Proxy settings (v2.4)' MUST ( gosaProxyAcctFlags ) MAY ( gosaProxyID $ gosaProxyWorkingStart $ gosaProxyWorkingStop $ gosaProxyQuota $ gosaProxyQuotaPeriod )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.9 NAME 'gosaApplication' - DESC 'Objectclass for GOsa applications (v2.1)' + DESC 'Objectclass for GOsa applications (v2.4)' MUST ( cn $ gosaApplicationExecute ) MAY ( gosaApplicationName $ gosaApplicationIcon $ gosaApplicationFlags $ gosaApplicationParameter $ description )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.10 NAME 'gosaApplicationGroup' SUP top AUXILIARY - DESC 'Objectclass for GOsa application groups (v2.1)' + DESC 'Objectclass for GOsa application groups (v2.4)' MUST ( cn ) MAY ( gosaMemberApplication $ gosaApplicationParameter )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate' SUP top AUXILIARY - DESC 'Objectclass for GOsa User Templates (v2.1)' + DESC 'Objectclass for GOsa User Templates (v2.4)' MUST ( cn )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.12 NAME 'gosaGroupOfNames' - DESC 'GOsa object grouping (v2.2)' + DESC 'GOsa object grouping (v2.4)' SUP top STRUCTURAL MUST ( cn $ gosaGroupObjects ) MAY ( businessCategory $ seeAlso $ owner $ ou $ o $ description $ member ) ) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount' - DESC 'GOsa webdav enabling account (v2.3)' + DESC 'GOsa webdav enabling account (v2.4)' SUP top AUXILIARY MUST ( cn $ uid )) diff --git a/contrib/openldap/gosa.schema b/contrib/openldap/gosa.schema index c46d2ce6f..cc6724876 100644 --- a/contrib/openldap/gosa.schema +++ b/contrib/openldap/gosa.schema @@ -208,68 +208,68 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.651 # Objectclasses objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.1 NAME 'gosaObject' AUXILIARY - DESC 'Objectclass for GOsa settings (v2.1)' + DESC 'Objectclass for GOsa settings (v2.4)' MUST ( gosaSubtreeACL )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.2 NAME 'gosaLockEntry' SUP top STRUCTURAL - DESC 'Objectclass for GOsa locking (v2.1)' + DESC 'Objectclass for GOsa locking (v2.4)' MUST ( gosaUser $ gosaObject $ cn )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTURAL - DESC 'Objectclass for GOsa caching (v2.1)' + DESC 'Objectclass for GOsa caching (v2.4)' MAY ( gosaUser ) MUST ( cn )) objectclass ( 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.1)' + DESC 'Objectclass to mark Departments for GOsa (v2.4)' MUST ( ou $ description )) objectclass ( 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.1)' + DESC 'Objectclass to mark MailAccounts for GOsa (v2.4)' MUST ( mail $ gosaMailServer $ gosaMailDeliveryMode) MAY ( gosaMailQuota $ gosaMailAlternateAddress $ gosaMailForwardingAddress $ gosaMailMaxSize $ gosaSpamSortLevel $ gosaSpamMailbox $ gosaVacationMessage $ gosaSharedFolderTarget $ acl)) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY - DESC 'Objectclass for GOsa Accounts (v2.1.2)' + DESC 'Objectclass for GOsa Accounts (v2.4)' MUST ( uid ) MAY ( lmPassword $ ntPassword $ pwdLastSet $ gosaDefaultPrinter $ gosaDefaultLanguage $ academicTitle $ personalTitle $ gosaHostACL $ dateOfBirth $ gender )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.7 NAME 'gosaHost' SUP top AUXILIARY - DESC 'Objectclass for GOsa Hosts (v2.1)' + DESC 'Objectclass for GOsa Hosts (v2.4)' MUST ( cn ) MAY ( description $ gosaService )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.8 NAME 'gosaProxyAccount' SUP top AUXILIARY - DESC 'Objectclass for GOsa Proxy settings (v2.1.2)' + DESC 'Objectclass for GOsa Proxy settings (v2.4)' MUST ( gosaProxyAcctFlags ) MAY ( gosaProxyID $ gosaProxyWorkingStart $ gosaProxyWorkingStop $ gosaProxyQuota $ gosaProxyQuotaPeriod )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.9 NAME 'gosaApplication' - DESC 'Objectclass for GOsa applications (v2.1)' + DESC 'Objectclass for GOsa applications (v2.4)' MUST ( cn $ gosaApplicationExecute ) MAY ( gosaApplicationName $ gosaApplicationIcon $ gosaApplicationFlags $ gosaApplicationParameter $ description )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.10 NAME 'gosaApplicationGroup' SUP top AUXILIARY - DESC 'Objectclass for GOsa application groups (v2.1)' + DESC 'Objectclass for GOsa application groups (v2.4)' MUST ( cn ) MAY ( gosaMemberApplication $ gosaApplicationParameter )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate' SUP top AUXILIARY - DESC 'Objectclass for GOsa User Templates (v2.1)' + DESC 'Objectclass for GOsa User Templates (v2.4)' MUST ( cn )) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.12 NAME 'gosaGroupOfNames' - DESC 'GOsa object grouping (v2.2)' + DESC 'GOsa object grouping (v2.4)' SUP top STRUCTURAL MUST ( cn $ gosaGroupObjects ) MAY ( businessCategory $ seeAlso $ owner $ ou $ o $ description $ member ) ) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount' - DESC 'GOsa webdav enabling account (v2.3)' + DESC 'GOsa webdav enabling account (v2.4)' SUP top AUXILIARY MUST ( cn $ uid )) diff --git a/contrib/openldap/goserver.schema b/contrib/openldap/goserver.schema index ef8ebf3b8..aafdd0280 100644 --- a/contrib/openldap/goserver.schema +++ b/contrib/openldap/goserver.schema @@ -157,72 +157,72 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.9.29 NAME 'goFonCountryCode' # Terminal Server description objectclass (1.3.6.1.4.1.10098.1.2.1.16 NAME 'goTerminalServer' SUP top AUXILIARY - DESC 'Terminal server description (v2.1)' + DESC 'Terminal server description (v2.4)' MUST ( cn $ goXdmcpIsEnabled $ goFontPath ) MAY ( description )) # NFS Server description objectclass (1.3.6.1.4.1.10098.1.2.1.19 NAME 'goNfsServer' SUP top AUXILIARY - DESC 'NFS server description (v2.1)' + DESC 'NFS server description (v2.4)' MUST ( cn ) MAY ( goExportEntry $ description )) # Time Server description objectclass (1.3.6.1.4.1.10098.1.2.1.20 NAME 'goNtpServer' SUP top AUXILIARY - DESC 'Time server description (v2.1)' + DESC 'Time server description (v2.4)' MUST ( cn ) MAY ( goTimeSource $ description )) # Syslog Server description objectclass (1.3.6.1.4.1.10098.1.2.1.21 NAME 'goSyslogServer' SUP top AUXILIARY - DESC 'Syslog server description (v2.1)' + DESC 'Syslog server description (v2.4)' MUST ( cn ) MAY ( goSyslogSection $ description )) # LDAP Server description objectclass (1.3.6.1.4.1.10098.1.2.1.22 NAME 'goLdapServer' SUP top AUXILIARY - DESC 'LDAP server description (v2.1)' + DESC 'LDAP server description (v2.4)' MUST ( cn ) MAY ( goLdapBase $ description )) # CUPS Server description objectclass (1.3.6.1.4.1.10098.1.2.1.23 NAME 'goCupsServer' SUP top AUXILIARY - DESC 'CUPS server description (v2.1)' + DESC 'CUPS server description (v2.4)' MUST ( cn ) MAY ( description )) # IMAP Server description objectclass (1.3.6.1.4.1.10098.1.2.1.24 NAME 'goImapServer' SUP top AUXILIARY - DESC 'IMAP server description (v2.1)' + DESC 'IMAP server description (v2.4)' MUST ( cn $ goImapName $ goImapConnect $ goImapAdmin $ goImapPassword ) MAY ( goImapSieveServer $ goImapSievePort $ description )) # Kerberos Server description objectclass (1.3.6.1.4.1.10098.1.2.1.25 NAME 'goKrbServer' SUP top AUXILIARY - DESC 'Kerberos server description (v2.1)' + DESC 'Kerberos server description (v2.4)' MUST ( cn $ goKrbRealm $ goKrbAdmin $ goKrbPassword ) MAY ( description )) # Fax Server description objectclass (1.3.6.1.4.1.10098.1.2.1.26 NAME 'goFaxServer' SUP top AUXILIARY - DESC 'Fax server description (v2.1)' + DESC 'Fax server description (v2.4)' MUST ( cn $ goFaxAdmin $ goFaxPassword ) MAY ( description )) # Common server class objectclass (1.3.6.1.4.1.10098.1.2.1.27 NAME 'goServer' SUP top STRUCTURAL - DESC 'Server description (v2.1)' + DESC 'Server description (v2.4)' MUST ( cn ) MAY ( description $ macAddress )) # LogDB Server description objectclass (1.3.6.1.4.1.10098.1.2.1.28 NAME 'goLogDBServer' SUP top AUXILIARY - DESC 'Log DB server description (v2.2)' + DESC 'Log DB server description (v2.4)' MUST ( cn $ goLogAdmin $ goLogPassword )) # Fon Server description objectclass (1.3.6.1.4.1.10098.1.2.1.29 NAME 'goFonServer' SUP top AUXILIARY - DESC 'Fon server description (v2.2)' + DESC 'Fon server description (v2.4)' MUST ( cn $ goFonAdmin $ goFonPassword $ goFonAreaCode $ goFonCountryCode ) MAY ( description )) diff --git a/include/setup_checks.inc b/include/setup_checks.inc index 86d245cb3..d91f12447 100644 --- a/include/setup_checks.inc +++ b/include/setup_checks.inc @@ -43,34 +43,34 @@ function schema_check($server, $admin, $password,$aff=0) $messages= array(); $required_classes= array( - "gosaObject" => array("version" => "2.1"), - "gosaAccount" => array("version" => "2.1.2"), - "gosaLockEntry" => array("version" => "2.1"), - "gosaCacheEntry" => array("version" => "2.1"), - "gosaDepartment" => array("version" => "2.1"), + "gosaObject" => array("version" => "2.4"), + "gosaAccount" => array("version" => "2.4"), + "gosaLockEntry" => array("version" => "2.4"), + "gosaCacheEntry" => array("version" => "2.4"), + "gosaDepartment" => array("version" => "2.4"), "goFaxAccount" => array("version" => "1.0.4", "class" => "gofaxAccount","file" => "gofax.schema"), "goFaxSBlock" => array("version" => "1.0.4", "class" => "gofaxAccount","file" => "gofax.schema"), "goFaxRBlock" => array("version" => "1.0.4", "class" => "gofaxAccount","file" => "gofax.schema"), - "gosaUserTemplate" => array("version" => "2.1", "class" => "posixAccount","file" => "nis.schema"), - "gosaMailAccount" => array("version" => "2.1", "class" => "mailAccount","file" => "gosa+samba3.schema"), - "gosaProxyAccount" => array("version" => "2.1.2", "class" => "proxyAccount","file" => "gosa+samba3.schema"), - "gosaApplication" => array("version" => "2.1", "class" => "appgroup","file" => "gosa.schema"), - "gosaApplicationGroup" => array("version" => "2.1", "class" => "appgroup","file" => "gosa.schema"), - - "GOhard" => array("version" => "2.1", "class" => "terminals","file" => "goto.schema"), - "gotoTerminal" => array("version" => "2.0", "class" => "terminals","file" => "goto.schema"), - "goServer" => array("version" => "2.1","class" => "server","file" => "goserver.schema"), - "goTerminalServer" => array("version" => "2.1", "class" => "terminals","file" => "goto.schema"), - "goNfsServer" => array("version" => "2.1", "class" => "terminals","file" => "goto.schema"), - "goNtpServer" => array("version" => "2.1", "class" => "terminals","file" => "goto.schema"), - "goSyslogServer" => array("version" => "2.1", "class" => "terminals","file" => "goto.schema"), - "goLdapServer" => array("version" => "2.1"), - "goCupsServer" => array("version" => "2.1", "class" => array("posixAccount", "terminals"),), - "goImapServer" => array("version" => "2.1", "class" => array("mailAccount", "mailgroup"),"file" => "gosa+samba3.schema"), - "goKrbServer" => array("version" => "2.1"), - "goFaxServer" => array("version" => "2.1", "class" => "gofaxAccount","file" => "gofax.schema"), + "gosaUserTemplate" => array("version" => "2.4", "class" => "posixAccount","file" => "nis.schema"), + "gosaMailAccount" => array("version" => "2.4", "class" => "mailAccount","file" => "gosa+samba3.schema"), + "gosaProxyAccount" => array("version" => "2.4", "class" => "proxyAccount","file" => "gosa+samba3.schema"), + "gosaApplication" => array("version" => "2.4", "class" => "appgroup","file" => "gosa.schema"), + "gosaApplicationGroup" => array("version" => "2.4", "class" => "appgroup","file" => "gosa.schema"), + + "GOhard" => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"), + "gotoTerminal" => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"), + "goServer" => array("version" => "2.4","class" => "server","file" => "goserver.schema"), + "goTerminalServer" => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"), + "goNfsServer" => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"), + "goNtpServer" => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"), + "goSyslogServer" => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"), + "goLdapServer" => array("version" => "2.4"), + "goCupsServer" => array("version" => "2.4", "class" => array("posixAccount", "terminals"),), + "goImapServer" => array("version" => "2.4", "class" => array("mailAccount", "mailgroup"),"file" => "gosa+samba3.schema"), + "goKrbServer" => array("version" => "2.4"), + "goFaxServer" => array("version" => "2.4", "class" => "gofaxAccount","file" => "gofax.schema"), ); -- 2.30.2