Updated ldifs

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

diff --git a/gosa-core/contrib/openldap/gofax.ldif b/gosa-core/contrib/openldap/gofax.ldif
index 318b09cc0328b4f4618a6520de9bb409b68fe771..193cab66d4abeeec17a56e48e8f028e324c9fd68 100644 (file)
--- a/gosa-core/contrib/openldap/gofax.ldif
+++ b/gosa-core/contrib/openldap/gofax.ldif
@@ -12,6 +12,7 @@ olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.7.7 NAME 'goFaxRBlockgroups' DESC 'de
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.7.9 NAME 'goFaxSBlockgroups' DESC 'defines groups of sender blocklists the user belongs to' EQUALITY caseExactIA5Match SUBSTR caseExactIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.7.10 NAME 'goFaxIsEnabled' DESC 'This account is enabled or not' EQUALITY caseExactIA5Match SUBSTR caseExactIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.7.11 NAME 'facsimileAlternateTelephoneNumber' EQUALITY telephoneNumberMatch SUBSTR telephoneNumberSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.50{32} )
-olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.11 NAME 'goFaxAccount' SUP top AUXILIARY DESC 'goFax Account (v1.0.4)' MUST ( goFaxDeliveryMode $ facsimileTelephoneNumber $ uid $ goFaxIsEnabled ) MAY ( goFaxPrinter $ goFaxDivertNumber $ goFaxLanguage $ goFaxFormat $ goFaxRBlocklist $ goFaxRBlockgroups $ goFaxSBlocklist $ goFaxSBlockgroups $ mail $ facsimileAlternateTelephoneNumber ))
+olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.11 NAME 'goFaxAccount' SUP top AUXILIARY DESC 'goFax Account
+olcObjectClasses: (v1.0.4)' MUST ( goFaxDeliveryMode $ facsimileTelephoneNumber $ uid $ goFaxIsEnabled ) MAY ( goFaxPrinter $ goFaxDivertNumber $ goFaxLanguage $ goFaxFormat $ goFaxRBlocklist $ goFaxRBlockgroups $ goFaxSBlocklist $ goFaxSBlockgroups $ mail $ facsimileAlternateTelephoneNumber ))
 olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.12 NAME 'goFaxSBlock' DESC 'goFax send blocklist groups (v1.0.4)' MUST ( cn ) MAY ( goFaxSBlocklist $ description ))
 olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.13 NAME 'goFaxRBlock' DESC 'goFax receive blocklist groups (v1.0.4)' MUST ( cn ) MAY ( goFaxRBlocklist $ description ))

diff --git a/gosa-core/contrib/openldap/gofon.ldif b/gosa-core/contrib/openldap/gofon.ldif
index e4fa93f8ea73cf0fa7abadd50a1e16d263d4231f..fc634536b77aa063b9f5fb719bb8073f81ed365d 100644 (file)
--- a/gosa-core/contrib/openldap/gofon.ldif
+++ b/gosa-core/contrib/openldap/gofon.ldif
@@ -48,7 +48,8 @@ olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.13.44 NAME 'goFonConferenceTimeOut' D
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.13.45 NAME 'goFonConferenceOwner' DESC 'Holds the queue goFonConferenceOwner definitions' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} SINGLE-VALUE)
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.13.46 NAME 'goFonVoicemailPIN' DESC 'defines voicemail delivery format' EQUALITY caseExactIA5Match SUBSTR caseExactIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.13.47 NAME 'goFonHomeServer' DESC 'defines voicemail delivery format' EQUALITY caseExactMatch SUBSTR caseExactSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)
-olcObjectClasses: (1.3.6.1.4.1.10098.1.2.3.11 NAME 'goFonAccount' SUP top AUXILIARY DESC 'GOFon Account (v1.0)' MUST ( goFonDeliveryMode $ telephoneNumber $ uid ) MAY ( goFonFormat $ goFonForwarding $ goFonHardware $ goFonPIN $ goFonVoicemailPIN $ goFonMacro $ goFonHomeServer ))
+olcObjectClasses: (1.3.6.1.4.1.10098.1.2.3.11 NAME 'goFonAccount' SUP top AUXILIARY DESC 'GOFon Account
+olcObjectClasses: (v1.0)' MUST ( goFonDeliveryMode $ telephoneNumber $ uid ) MAY ( goFonFormat $ goFonForwarding $ goFonHardware $ goFonPIN $ goFonVoicemailPIN $ goFonMacro $ goFonHomeServer ))
 olcObjectClasses: (1.3.6.1.4.1.10098.1.2.3.12 NAME 'goFonHardware' SUP top STRUCTURAL DESC 'defines a telephone (v1.0)' MUST ( cn $ macAddress $ ipHostNumber ) MAY (description $ goFonType $ goFonDmtfMode $ goFonHost $ goFonDefaultIP $ goFonQualify $ goFonAuth $ goFonSecret $ goFonInkeys $ goFonOutkey $ goFonTrunk $ goFonAccountCode $ goFonMSN $ goFonPermit $ goFonDeny ) )
 olcObjectClasses: (1.3.6.1.4.1.10098.1.2.3.13 NAME 'goFonPickupGroup' SUP top AUXILIARY DESC 'Additive for posixGroups (v1.0)' MUST ( cn $ gidNumber ) )
 olcObjectClasses: (1.3.6.1.4.1.10098.1.2.3.14 NAME 'goFonMacro' SUP top STRUCTURAL DESC 'Macro definitions for asterisk machines (v1.0)' MUST ( cn ) MAY ( goFonMacroVisible $ displayName $ goFonMacroContent $ description $ goFonMacroParameter ))

diff --git a/gosa-core/contrib/openldap/gosystem.ldif b/gosa-core/contrib/openldap/gosystem.ldif
index 279dfa2bae7da2c396ac1c919e424ff6f905c060..9831752295b6319690c7b1d109c432dfc2547580 100644 (file)
--- a/gosa-core/contrib/openldap/gosystem.ldif
+++ b/gosa-core/contrib/openldap/gosystem.ldif
@@ -50,4 +50,5 @@ olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.2.9 NAME 'ghGfxAdapter' DESC 'Hardwar
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.2.10 NAME 'ghInventoryNumber' DESC 'Unique number for inclusion in an inventory' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.2.11 NAME 'gotoSysStatus' DESC 'Keeps current system status - info shown in GOsa' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.2.12 NAME 'gotoHardwareChecksum' DESC 'GOto - quick way to see if something has changed' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
-olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.3 NAME 'GOhard' DESC 'Gonicus Hardware definitions, objectClass (v2.6.1)' SUP top STRUCTURAL MUST ( cn ) MAY ( ghGfxAdapter $ ghNetNic $ ghSoundAdapter $ ghIdeDev $ ghScsiDev $ macAddress $ ghUsbSupport $ ghMemSize $ ghCpuType $ ghInventoryNumber $ gotoSyslogServer $ gotoNtpServer $ gotoSwapServer $ gotoLpdServer $ gotoFontPath $ gotoFilesystem $ gotoFloppyEnable $ gotoCdromEnable $ gotoLpdEnable $ gotoScannerEnable $ gotoScannerClients $ gotoRootPasswd $ gotoXdmcpServer $ gotoXMethod $ gotoSndModule $ gotoLastUser $ gotoXMonitor $ gotoXHsync $ gotoXVsync $ gotoXResolution $ gotoXColordepth $ gotoXMouseport $ gotoXMouseButtons $ gotoMode $ gotoXKbModel $ gotoXKbLayout $ gotoXKbVariant $ gotoXDriver $ gotoXMouseType $ macAddress $ gotoAutoFs $ gotoModules $ gotoAdaptPath $ gotoKernelParameters $ gotoBootKernel $ gotoTerminalPath $ gotoLdapServer $ gotoScannerModel $ ipHostNumber $ l $ gotoSysStatus $ description $ gotoHardwareChecksum ) )
+olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.3 NAME 'GOhard' DESC 'Gonicus Hardware definitions,
+olcObjectClasses: (v2.6.1)' SUP top STRUCTURAL MUST ( cn ) MAY ( ghGfxAdapter $ ghNetNic $ ghSoundAdapter $ ghIdeDev $ ghScsiDev $ macAddress $ ghUsbSupport $ ghMemSize $ ghCpuType $ ghInventoryNumber $ gotoSyslogServer $ gotoNtpServer $ gotoSwapServer $ gotoLpdServer $ gotoFontPath $ gotoFilesystem $ gotoFloppyEnable $ gotoCdromEnable $ gotoLpdEnable $ gotoScannerEnable $ gotoScannerClients $ gotoRootPasswd $ gotoXdmcpServer $ gotoXMethod $ gotoSndModule $ gotoLastUser $ gotoXMonitor $ gotoXHsync $ gotoXVsync $ gotoXResolution $ gotoXColordepth $ gotoXMouseport $ gotoXMouseButtons $ gotoMode $ gotoXKbModel $ gotoXKbLayout $ gotoXKbVariant $ gotoXDriver $ gotoXMouseType $ macAddress $ gotoAutoFs $ gotoModules $ gotoAdaptPath $ gotoKernelParameters $ gotoBootKernel $ gotoTerminalPath $ gotoLdapServer $ gotoScannerModel $ ipHostNumber $ l $ gotoSysStatus $ description $ gotoHardwareChecksum ) )

diff --git a/gosa-core/contrib/openldap/goto-mime.ldif b/gosa-core/contrib/openldap/goto-mime.ldif
index 37dd61370e7275aa44c2ee2388d5e72dee6de396..bafd1e0f36021cdbe7d0ffbc924a769f542d84ce 100644 (file)
--- a/gosa-core/contrib/openldap/goto-mime.ldif
+++ b/gosa-core/contrib/openldap/goto-mime.ldif
@@ -7,4 +7,4 @@ olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.14.3 NAME 'gotoMimeApplication' DESC
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.14.4 NAME 'gotoMimeEmbeddedApplication' DESC 'Assigned application and priority for embedded applications' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.14.5 NAME 'gotoMimeLeftClickAction' DESC 'GOto - Gonicus Terminal Concept, PPD data' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.14.6 NAME 'gotoMimeIcon' DESC 'Specify the mime icon' SYNTAX 1.3.6.1.4.1.1466.115.121.1.28 SINGLE-VALUE)
-olcObjectClasses: (1.3.6.1.4.1.10098.1.2.4.1 NAME 'gotoMimeType' DESC 'Class to represent global mime types (v2.5)' SUP top STRUCTURAL MUST ( cn $ gotoMimeFilePattern $ gotoMimeGroup ) MAY ( description $ gotoMimeIcon $ gotoMimeApplication $ gotoMimeEmbeddedApplication $ gotoMimeLeftClickAction ))
+olcObjectClasses: (1.3.6.1.4.1.10098.1.2.4.1 NAME 'gotoMimeType' DESC 'Class to represent global mime types (v2.6.1)' SUP top STRUCTURAL MUST ( cn $ gotoMimeFilePattern $ gotoMimeGroup ) MAY ( description $ gotoMimeIcon $ gotoMimeApplication $ gotoMimeEmbeddedApplication $ gotoMimeLeftClickAction ))

diff --git a/gosa-core/contrib/openldap/goto.ldif b/gosa-core/contrib/openldap/goto.ldif
index 7e1ede8f1f5b32d8ddb86114032a6c6fbdcb7f74..7f8cb21022775c1e938a5be3eb90ed943534fc8f 100644 (file)
--- a/gosa-core/contrib/openldap/goto.ldif
+++ b/gosa-core/contrib/openldap/goto.ldif
@@ -14,10 +14,15 @@ olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.11.17 NAME 'gotoGroupAdminPrinter' DE
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.11.14 NAME 'gotoHotplugDevice' DESC 'GOto - keeps hotplug devices' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.11.15 NAME 'gotoProfileQuota' DESC 'GOto - save quota for home' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
 olcAttributeTypes: ( 1.3.6.1.4.1.10098.1.1.11.18 NAME 'gotoHotplugDeviceDN' DESC 'GOto - points to hotplug devices' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12)
-olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.1 NAME 'gotoTerminal' DESC 'GOto - Gonicus Terminal Concept, objectclass (v2.6.1)' SUP top AUXILIARY MUST ( cn ) MAY ( description $ macAddress $ ipHostNumber $ gotoShare $ goFonHardware ))
-olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.30 NAME 'gotoWorkstation' DESC 'GOto - Gonicus Terminal Concept, objectclass (v2.6.1)' SUP top AUXILIARY MUST ( cn ) MAY ( description $ macAddress $ ipHostNumber $ gotoShare $ goFonHardware ))
-olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.31 NAME 'gotoPrinter' DESC 'GOto - Gonicus Terminal Concept, objectclass (v2.2)' SUP top STRUCTURAL MUST ( cn ) MAY ( labeledURI $ description $ l $ gotoPrinterPPD $ macAddress $ ipHostNumber $ gotoUserPrinter $ gotoUserAdminPrinter $ gotoGroupPrinter $ gotoGroupAdminPrinter ) )
+olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.1 NAME 'gotoTerminal' DESC 'GOto - Gonicus Terminal Concept,
+olcObjectClasses: (v2.6.1)' SUP top AUXILIARY MUST ( cn ) MAY ( description $ macAddress $ ipHostNumber $ gotoShare $ goFonHardware ))
+olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.30 NAME 'gotoWorkstation' DESC 'GOto - Gonicus Terminal Concept,
+olcObjectClasses: (v2.6.1)' SUP top AUXILIARY MUST ( cn ) MAY ( description $ macAddress $ ipHostNumber $ gotoShare $ goFonHardware ))
+olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.31 NAME 'gotoPrinter' DESC 'GOto - Gonicus Terminal Concept,
+olcObjectClasses: (v2.2)' SUP top STRUCTURAL MUST ( cn ) MAY ( labeledURI $ description $ l $ gotoPrinterPPD $ macAddress $ ipHostNumber $ gotoUserPrinter $ gotoUserAdminPrinter $ gotoGroupPrinter $ gotoGroupAdminPrinter ) )
 olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.32 NAME 'gotoEnvironment' DESC 'GOto - contains environment settings (v2.2)' SUP top AUXILIARY MAY ( gotoProfileServer $ gotoProfileFlags $ gotoXResolution $ gotoShare $ gotoLogonScript $ gotoKioskProfile $ gotoHotplugDevice $ gotoProfileQuota $ gotoHotplugDeviceDN ) )
-olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.34 NAME 'gotoWorkstationTemplate' DESC 'GOto - Gonicus Terminal Concept, objectclass (v2.6.1)' SUP top AUXILIARY MUST ( cn ) MAY ( description $ gotoShare $ goFonHardware $ ghGfxAdapter $ ghNetNic $ ghSoundAdapter $ ghIdeDev $ ghScsiDev $ ghUsbSupport $ ghMemSize $ ghCpuType $ ghInventoryNumber $ gotoSyslogServer $ gotoNtpServer $ gotoSwapServer $ gotoLpdServer $ gotoFontPath $ gotoFilesystem $ gotoFloppyEnable $ gotoCdromEnable $ gotoLpdEnable $ gotoScannerEnable $ gotoScannerClients $ gotoRootPasswd $ gotoXdmcpServer $ gotoXMethod $ gotoSndModule $ gotoLastUser $ gotoXMonitor $ gotoXHsync $ gotoXVsync $ gotoXResolution $ gotoXColordepth $ gotoXMouseport $ gotoXMouseButtons $ gotoMode $ gotoXKbModel $ gotoXKbLayout $ gotoXKbVariant $ gotoXDriver $ gotoXMouseType $ macAddress $ gotoAutoFs $ gotoModules $ gotoAdaptPath $ gotoKernelParameters $ gotoBootKernel $ gotoTerminalPath $ gotoLdapServer $ gotoScannerModel ))
-olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.35 NAME 'gotoTerminalTemplate' DESC 'GOto - Gonicus Terminal Concept, objectclass (v2.6.1)' SUP top AUXILIARY MUST ( cn ) MAY ( description $ gotoShare $ goFonHardware $ ghGfxAdapter $ ghNetNic $ ghSoundAdapter $ ghIdeDev $ ghScsiDev $ ghUsbSupport $ ghMemSize $ ghCpuType $ ghInventoryNumber $ gotoSyslogServer $ gotoNtpServer $ gotoSwapServer $ gotoLpdServer $ gotoFontPath $ gotoFilesystem $ gotoFloppyEnable $ gotoCdromEnable $ gotoLpdEnable $ gotoScannerEnable $ gotoScannerClients $ gotoRootPasswd $ gotoXdmcpServer $ gotoXMethod $ gotoSndModule $ gotoLastUser $ gotoXMonitor $ gotoXHsync $ gotoXVsync $ gotoXResolution $ gotoXColordepth $ gotoXMouseport $ gotoXMouseButtons $ gotoMode $ gotoXKbModel $ gotoXKbLayout $ gotoXKbVariant $ gotoXDriver $ gotoXMouseType $ macAddress $ gotoAutoFs $ gotoModules $ gotoAdaptPath $ gotoKernelParameters $ gotoBootKernel $ gotoTerminalPath $ gotoLdapServer $ gotoScannerModel ))
+olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.34 NAME 'gotoWorkstationTemplate' DESC 'GOto - Gonicus Terminal Concept,
+olcObjectClasses: (v2.6.1)' SUP top AUXILIARY MUST ( cn ) MAY ( description $ gotoShare $ goFonHardware $ ghGfxAdapter $ ghNetNic $ ghSoundAdapter $ ghIdeDev $ ghScsiDev $ ghUsbSupport $ ghMemSize $ ghCpuType $ ghInventoryNumber $ gotoSyslogServer $ gotoNtpServer $ gotoSwapServer $ gotoLpdServer $ gotoFontPath $ gotoFilesystem $ gotoFloppyEnable $ gotoCdromEnable $ gotoLpdEnable $ gotoScannerEnable $ gotoScannerClients $ gotoRootPasswd $ gotoXdmcpServer $ gotoXMethod $ gotoSndModule $ gotoLastUser $ gotoXMonitor $ gotoXHsync $ gotoXVsync $ gotoXResolution $ gotoXColordepth $ gotoXMouseport $ gotoXMouseButtons $ gotoMode $ gotoXKbModel $ gotoXKbLayout $ gotoXKbVariant $ gotoXDriver $ gotoXMouseType $ macAddress $ gotoAutoFs $ gotoModules $ gotoAdaptPath $ gotoKernelParameters $ gotoBootKernel $ gotoTerminalPath $ gotoLdapServer $ gotoScannerModel ))
+olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.35 NAME 'gotoTerminalTemplate' DESC 'GOto - Gonicus Terminal Concept,
+olcObjectClasses: (v2.6.1)' SUP top AUXILIARY MUST ( cn ) MAY ( description $ gotoShare $ goFonHardware $ ghGfxAdapter $ ghNetNic $ ghSoundAdapter $ ghIdeDev $ ghScsiDev $ ghUsbSupport $ ghMemSize $ ghCpuType $ ghInventoryNumber $ gotoSyslogServer $ gotoNtpServer $ gotoSwapServer $ gotoLpdServer $ gotoFontPath $ gotoFilesystem $ gotoFloppyEnable $ gotoCdromEnable $ gotoLpdEnable $ gotoScannerEnable $ gotoScannerClients $ gotoRootPasswd $ gotoXdmcpServer $ gotoXMethod $ gotoSndModule $ gotoLastUser $ gotoXMonitor $ gotoXHsync $ gotoXVsync $ gotoXResolution $ gotoXColordepth $ gotoXMouseport $ gotoXMouseButtons $ gotoMode $ gotoXKbModel $ gotoXKbLayout $ gotoXKbVariant $ gotoXDriver $ gotoXMouseType $ macAddress $ gotoAutoFs $ gotoModules $ gotoAdaptPath $ gotoKernelParameters $ gotoBootKernel $ gotoTerminalPath $ gotoLdapServer $ gotoScannerModel ))
 olcObjectClasses: (1.3.6.1.4.1.10098.1.2.1.42 NAME 'gotoDevice' DESC 'GOto - contains environment settings (v2.6)' SUP top STRUCTURAL MUST ( cn ) MAY ( gotoHotplugDevice $ description ) )

diff --git a/gosa-core/contrib/openldap/samba3.ldif b/gosa-core/contrib/openldap/samba3.ldif
index 1d18c419cbc57417244fd769938ccf7a5ab50806..89ac218174843f7b96db7f688de2c282d7cfcf6d 100644 (file)
--- a/gosa-core/contrib/openldap/samba3.ldif
+++ b/gosa-core/contrib/openldap/samba3.ldif
@@ -46,9 +46,12 @@ olcAttributeTypes: ( 1.3.6.1.4.1.7165.2.1.64 NAME 'sambaLockoutObservationWindow
 olcAttributeTypes: ( 1.3.6.1.4.1.7165.2.1.65 NAME 'sambaLockoutThreshold' DESC 'Lockout users after bad logon attempts (default: 0 => off)' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 olcAttributeTypes: ( 1.3.6.1.4.1.7165.2.1.66 NAME 'sambaForceLogoff' DESC 'Disconnect Users outside logon hours (default: -1 => off, 0 => on)' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 olcAttributeTypes: ( 1.3.6.1.4.1.7165.2.1.67 NAME 'sambaRefuseMachinePwdChange' DESC 'Allow Machine Password changes (default: 0 => off)' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+olcAttributeTypes: ( 1.3.6.1.4.1.7165.2.1.68 NAME 'sambaClearTextPassword' DESC 'Clear text password (used for trusted domain passwords)' EQUALITY octetStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+olcAttributeTypes: ( 1.3.6.1.4.1.7165.2.1.69 NAME 'sambaPreviousClearTextPassword' DESC 'Previous clear text password (used for trusted domain passwords)' EQUALITY octetStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
 olcObjectClasses: ( 1.3.6.1.4.1.7165.2.2.6 NAME 'sambaSamAccount' SUP top AUXILIARY DESC 'Samba 3.0 Auxilary SAM Account' MUST ( uid $ sambaSID ) MAY ( cn $ sambaLMPassword $ sambaNTPassword $ sambaPwdLastSet $ sambaLogonTime $ sambaLogoffTime $ sambaKickoffTime $ sambaPwdCanChange $ sambaPwdMustChange $ sambaAcctFlags $ displayName $ sambaHomePath $ sambaHomeDrive $ sambaLogonScript $ sambaProfilePath $ description $ sambaUserWorkstations $ sambaPrimaryGroupSID $ sambaDomainName $ sambaMungedDial $ sambaBadPasswordCount $ sambaBadPasswordTime $ sambaPasswordHistory $ sambaLogonHours))
 olcObjectClasses: ( 1.3.6.1.4.1.7165.2.2.4 NAME 'sambaGroupMapping' SUP top AUXILIARY DESC 'Samba Group Mapping' MUST ( gidNumber $ sambaSID $ sambaGroupType ) MAY ( displayName $ description $ sambaSIDList ))
 olcObjectClasses: ( 1.3.6.1.4.1.7165.2.2.14 NAME 'sambaTrustPassword' SUP top STRUCTURAL DESC 'Samba Trust Password' MUST ( sambaDomainName $ sambaNTPassword $ sambaTrustFlags ) MAY ( sambaSID $ sambaPwdLastSet ))
+olcObjectClasses: ( 1.3.6.1.4.1.7165.2.2.15 NAME 'sambaTrustedDomainPassword' SUP top STRUCTURAL DESC 'Samba Trusted Domain Password' MUST ( sambaDomainName $ sambaSID $ sambaClearTextPassword $ sambaPwdLastSet ) MAY ( sambaPreviousClearTextPassword ))
 olcObjectClasses: ( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain' SUP top STRUCTURAL DESC 'Samba Domain Information' MUST ( sambaDomainName $ sambaSID ) MAY ( sambaNextRid $ sambaNextGroupRid $ sambaNextUserRid $ sambaAlgorithmicRidBase $ sambaMinPwdLength $ sambaPwdHistoryLength $ sambaLogonToChgPwd $ sambaMaxPwdAge $ sambaMinPwdAge $ sambaLockoutDuration $ sambaLockoutObservationWindow $ sambaLockoutThreshold $ sambaForceLogoff $ sambaRefuseMachinePwdChange ))
 olcObjectClasses: ( 1.3.6.1.4.1.7165.2.2.7 NAME 'sambaUnixIdPool' SUP top AUXILIARY DESC 'Pool for allocating UNIX uids/gids' MUST ( uidNumber $ gidNumber ) )
 olcObjectClasses: ( 1.3.6.1.4.1.7165.2.2.8 NAME 'sambaIdmapEntry' SUP top AUXILIARY DESC 'Mapping from a SID to an ID' MUST ( sambaSID ) MAY ( uidNumber $ gidNumber ) )