From 630626c6abe0a2d649dd03221ac43dd4ed53b0c0 Mon Sep 17 00:00:00 2001 From: janw Date: Mon, 1 Sep 2008 09:00:20 +0000 Subject: [PATCH] Removed SINGLE-VALUE from gosaLastSystemLogin. Changed name to gotoLastSystemLogin. Added attribute gotoLastSystem. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12318 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/contrib/openldap/gosa-samba2.ldif | 5 +++-- gosa-core/contrib/openldap/gosa-samba2.schema | 12 +++++++++--- gosa-core/contrib/openldap/gosa-samba3.ldif | 5 +++-- gosa-core/contrib/openldap/gosa-samba3.schema | 13 ++++++++++--- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/gosa-core/contrib/openldap/gosa-samba2.ldif b/gosa-core/contrib/openldap/gosa-samba2.ldif index 98fa21aa5..7cb5899d8 100644 --- a/gosa-core/contrib/openldap/gosa-samba2.ldif +++ b/gosa-core/contrib/openldap/gosa-samba2.ldif @@ -44,7 +44,8 @@ olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.12.40 NAME 'gosaSetting' DESC 'Origin olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.12.41 NAME 'gosaVacationStart' DESC 'Timestamp for enabling 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.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 'gosaLastSystemLogin' DESC 'Timestamp for a Users last System Login' 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.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{256} ) 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 ) @@ -54,7 +55,7 @@ olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.2 NAME 'gosaLockEntry' SUP top ST 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 $ gosaLastSystemLogin )) +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 )) diff --git a/gosa-core/contrib/openldap/gosa-samba2.schema b/gosa-core/contrib/openldap/gosa-samba2.schema index 2eeddd397..b0abb9dd3 100644 --- a/gosa-core/contrib/openldap/gosa-samba2.schema +++ b/gosa-core/contrib/openldap/gosa-samba2.schema @@ -251,9 +251,14 @@ attributetype ( 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) -attributetype ( 1.3.6.1.4.1.10098.1.1.12.44 NAME 'gosaLastSystemLogin' +attributetype ( 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 SINGLE-VALUE) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + +attributetype ( 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) attributetype ( 1.3.6.1.4.1.10098.1.1.6.2 NAME 'academicTitle' DESC 'Field to represent the academic title' @@ -310,7 +315,8 @@ 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)' MUST ( uid ) MAY ( lmPassword $ ntPassword $ pwdLastSet $ gosaDefaultPrinter $ gosaDefaultLanguage $ - academicTitle $ personalTitle $ gosaHostACL $ dateOfBirth $ gender $ gosaLastSystemLogin )) + 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)' diff --git a/gosa-core/contrib/openldap/gosa-samba3.ldif b/gosa-core/contrib/openldap/gosa-samba3.ldif index 491949b45..9aa965744 100644 --- a/gosa-core/contrib/openldap/gosa-samba3.ldif +++ b/gosa-core/contrib/openldap/gosa-samba3.ldif @@ -44,7 +44,8 @@ olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.12.40 NAME 'gosaSetting' DESC 'Origin olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.12.41 NAME 'gosaVacationStart' DESC 'Timestamp for enabling 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.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 'gosaLastSystemLogin' DESC 'Timestamp for a Users last System Login' 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.6.2 NAME 'academicTitle' DESC 'Field to represent the academic title' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26) 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 ) @@ -54,7 +55,7 @@ olcObjectClasses: ( 1.3.6.1.4.1.10098.1.2.1.19.2 NAME 'gosaLockEntry' SUP top ST 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 $ gosaLastSystemLogin )) +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 )) diff --git a/gosa-core/contrib/openldap/gosa-samba3.schema b/gosa-core/contrib/openldap/gosa-samba3.schema index 569d341e4..1637f53eb 100644 --- a/gosa-core/contrib/openldap/gosa-samba3.schema +++ b/gosa-core/contrib/openldap/gosa-samba3.schema @@ -253,9 +253,15 @@ attributetype ( 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) -attributetype ( 1.3.6.1.4.1.10098.1.1.12.44 NAME 'gosaLastSystemLogin' +attributetype ( 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 SINGLE-VALUE) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + +attributetype ( 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) + attributetype ( 1.3.6.1.4.1.10098.1.1.6.2 NAME 'academicTitle' DESC 'Field to represent the academic title' @@ -313,7 +319,8 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY MUST ( uid ) MAY ( sambaLMPassword $ sambaNTPassword $ sambaPwdLastSet $ gosaDefaultPrinter $ gosaDefaultLanguage $ academicTitle $ personalTitle $ gosaHostACL $ dateOfBirth $ - sambaBadPasswordCount $ sambaBadPasswordTime $ gender $ gosaLastSystemLogin )) + sambaBadPasswordCount $ sambaBadPasswordTime $ 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)' -- 2.30.2