Fixes #3853 Removing obsolete attributes and objectClasses

contrib/openldap/core-fd-conf.schema

@@ -225,13 +225,6 @@ attributetype ( 1.3.6.1.4.1.38414.8.14.2 NAME 'fdListSummary'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE )
 
-attributetype ( 1.3.6.1.4.1.38414.8.14.3 NAME 'fdHonourUnitTags'
-  DESC 'FusionDirectory - Honour unit tags'
-  OBSOLETE
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE )
-
 attributetype ( 1.3.6.1.4.1.38414.8.14.4 NAME 'fdModificationDetectionAttribute'
   DESC 'FusionDirectory - Modification detection attribute'
   EQUALITY caseExactIA5Match
@@ -358,13 +351,6 @@ attributetype ( 1.3.6.1.4.1.38414.8.17.5 NAME 'fdSnapshotAdminPassword'
 
 # Miscellaneous
 
-attributetype ( 1.3.6.1.4.1.38414.8.18.1 NAME 'fdHonourIvbbAttributes'
-  DESC 'FusionDirectory - Honour ivbb attributes'
-  OBSOLETE
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE )
-
 attributetype ( 1.3.6.1.4.1.38414.8.18.2 NAME 'fdTabHook'
   DESC 'FusionDirectory - tab hook'
   EQUALITY caseExactIA5Match
@@ -510,9 +496,9 @@ objectclass ( 1.3.6.1.4.1.38414.8.2.1 NAME 'fusionDirectoryConf'
     fdLoginAttribute $ fdForceSSL $ fdWarnSSL $ fdStoreFilterSettings $ fdSessionLifeTime $
     fdDisplayErrors $ fdLdapMaxQueryTime $ fdLdapStats $ fdDebugLevel $
     fdEnableSnapshots $ fdSnapshotBase $
-    fdHonourIvbbAttributes $ fdTabHook $ fdShells $ fdDisplayHookOutput $
+    fdTabHook $ fdShells $ fdDisplayHookOutput $
     fdAclTabOnObjects $
-    fdHonourUnitTags $ fdRfc2307bis $ fdCopyPaste $ fdSnapshotURI $
+    fdRfc2307bis $ fdCopyPaste $ fdSnapshotURI $
     fdSnapshotAdminDn $ fdSnapshotAdminPassword
   ) )
 

contrib/openldap/core-fd.schema

@@ -35,13 +35,6 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.30 NAME 'gosaGroupObjects'
   SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.10098.1.1.12.33 NAME 'gosaUnitTag'
-  DESC 'Takes a list of relevant mime-type|priority settings'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
-
 attributetype ( 1.3.6.1.4.1.10098.1.1.12.34 NAME 'gosaAclTemplate'
   DESC 'Takes ACL entries for gosaRoles'
   EQUALITY caseIgnoreIA5Match
@@ -54,12 +47,6 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.35 NAME 'gosaAclEntry'
   SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
-attributetype ( 1.3.6.1.4.1.10098.1.1.12.36 NAME 'gosaSnapshotType'
-  DESC 'Takes either undo or snapshot'
-  OBSOLETE
-  EQUALITY caseIgnoreMatch
-  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.37 NAME 'gosaSnapshotTimestamp'
   DESC 'Unix timestamp of snapshot'
   EQUALITY caseIgnoreMatch
@@ -139,18 +126,6 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.12 NAME 'gosaGroupOfNames'
   SUP top AUXILIARY
   MUST ( cn $ gosaGroupObjects ) MAY ( member $ description ) )
 
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.15 NAME 'gosaAdministrativeUnit'
-  DESC 'Marker for administrational units'
-  OBSOLETE
-  SUP top AUXILIARY
-  MUST ( gosaUnitTag ))
-
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.16 NAME 'gosaAdministrativeUnitTag'
-  DESC 'Marker for objects below administrational units'
-  OBSOLETE
-  SUP top AUXILIARY
-  MUST ( gosaUnitTag ))
-
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.17 NAME 'gosaRole'
   DESC 'ACL container to define roles' SUP top STRUCTURAL
   MUST ( gosaAclTemplate $ cn )
@@ -163,6 +138,5 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.18 NAME 'gosaAcl'
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject'
   DESC 'Container object for undo and snapshot data' SUP top STRUCTURAL
   MUST ( gosaSnapshotTimestamp $ gosaSnapshotDN $ gosaSnapshotData )
-  MAY  ( description $
-          gosaSnapshotType ) )
+  MAY  ( description ) )