Replaced config->search with get_cfg_value

[gosa.git] / gosa-core / contrib / openldap / gosa-samba3.schema

diff --git a/gosa-core/contrib/openldap/gosa-samba3.schema b/gosa-core/contrib/openldap/gosa-samba3.schema
index fc06c9b7cef7b37c19b0ad7e9dbcaa670ff2dc5d..b30968b2ee90b9f49b0d60ef7cfaf8fcca956568 100644 (file)
--- a/gosa-core/contrib/openldap/gosa-samba3.schema
+++ b/gosa-core/contrib/openldap/gosa-samba3.schema
@@ -239,6 +239,8 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.39 NAME 'gosaSnapshotData'
 
 attributetype ( 1.3.6.1.4.1.10098.1.1.12.40 NAME 'gosaSetting'
         DESC 'Original DN of saved object'
+        EQUALITY caseIgnoreMatch
+       SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( 1.3.6.1.4.1.10098.1.1.12.41 NAME 'gosaVacationStart'
@@ -262,12 +264,19 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.45 NAME 'gotoLastSystem'
         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.12.46 NAME 'gosaLoginRestriction'
+        DESC 'Multivalue attribute to carry a number of allowed ips/subnets'
+        SUP name)
+
+attributetype ( 1.3.6.1.4.1.10098.1.1.12.47 NAME 'gosaUserDefinedFilter'
+        DESC 'A user defined filter'
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( 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)
+        EQUALITY caseIgnoreMatch
+        SUBSTR caseIgnoreSubstringsMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( 1.3.6.1.4.1.15305.2.1 NAME ( 'gender' 'sex' )
         DESC    'Gender: M for male, F for female'
@@ -305,7 +314,8 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTU
 
 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.6.1)'
-       MUST  ( ou $ description ))
+       MUST  ( ou $ description )
+       MAY   ( manager ))
 
 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.6.1)'
@@ -315,12 +325,12 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.5 NAME 'gosaMailAccount' SUP top AUXILI
               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.6.1)'
+        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 ))
+        gotoLastSystemLogin $ gotoLastSystem $ gosaLoginRestriction ))
 
 objectclass ( 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)'
@@ -390,6 +400,7 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject'
 
 objectclass ( 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
+       MUST ( cn ) 
        MAY  ( gosaSetting ) )
 
 # GOto submenu entries
@@ -404,3 +415,6 @@ objectclass (1.3.6.1.4.1.10098.1.2.1.44 NAME 'gotoMenuEntry'
         MUST ( cn )
         MAY ( gosaApplicationParameter $ gosaApplicationPriority ) )
 
+objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.21 NAME 'gosaProperties' SUP top AUXILIARY
+        DESC 'Class for GOsa Properties, stores for example user filters (v2.6.8)'
+        MAY ( gosaUserDefinedFilter ) )