diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema
index 09ba36624fa97fd19af578ae80a8ecda2a10281e..4ecf57cac704229ead69ba8aa0e998e426e9ef36 100644
--- a/contrib/openldap/core-fd.schema
+++ b/contrib/openldap/core-fd.schema
@@ -5,66 +5,67 @@
# Attributes
attributetype ( 1.3.6.1.4.1.10098.1.1.12.1 NAME 'gosaSubtreeACL'
- DESC 'GOsa acl entry'
+ DESC 'GOsa - ACL entry'
+ OBSOLETE
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.2 NAME 'gosaUser'
- DESC 'GOsa user'
+ DESC 'GOsa - DN of a user'
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.3 NAME 'gosaObject'
- DESC 'GOsa object'
+ DESC 'GOsa - DN of an 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.14 NAME 'gosaDefaultLanguage'
- DESC 'Defines the default language for a user'
+ DESC 'GOsa - Defines the default language for a user'
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.30 NAME 'gosaGroupObjects'
- DESC 'Takes a list of all object types that are in a gosaGroupOfNames'
+ DESC 'GOsa - List of all object types that are in a gosaGroupOfNames'
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'
+ DESC 'GOsa - ACL entries for ACL roles'
EQUALITY caseIgnoreIA5Match
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.35 NAME 'gosaAclEntry'
- DESC 'Takes ACL entries for gosaRoles'
+ DESC 'GOsa - ACL entries'
EQUALITY caseIgnoreIA5Match
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.37 NAME 'gosaSnapshotTimestamp'
- DESC 'Unix timestamp of snapshot'
+ DESC 'GOsa - Unix timestamp of snapshot'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
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.38 NAME 'gosaSnapshotDN'
- DESC 'Original DN of saved object'
+ DESC 'GOsa - Original DN of saved object in snapshot'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
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.39 NAME 'gosaSnapshotData'
- DESC 'Original DN of saved object'
+ DESC 'GOsa - Original data of saved object in snapshot'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 SINGLE-VALUE)
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'
+ DESC 'GOsa - Multivalue attribute to carry a number of allowed ips/subnets'
OBSOLETE
SUP name)
@@ -89,26 +90,28 @@ attributetype ( 1.3.6.1.4.1.15305.2.2 NAME ( 'dateOfBirth' 'dob' )
# Classes
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.1 NAME 'gosaObject' SUP top AUXILIARY
- DESC 'Class for GOsa settings'
- MUST ( gosaSubtreeACL ))
+ DESC 'GOsa - Class for GOsa settings'
+ OBSOLETE
+ MUST ( )
+ MAY ( gosaSubtreeACL ))
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.2 NAME 'gosaLockEntry' SUP top STRUCTURAL
- DESC 'Class for GOsa locking'
+ DESC 'GOsa - Class for GOsa locking'
MUST ( gosaUser $ gosaObject $ cn ))
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTURAL
- DESC 'Class for GOsa caching'
+ DESC 'GOsa - Class for GOsa caching'
OBSOLETE
- MAY ( gosaUser )
- MUST ( cn ))
+ MAY ( )
+ MUST ( cn $ gosaUser ))
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'
+ DESC 'GOsa - Class to mark Departments for GOsa'
MUST ( ou $ description )
MAY ( manager ))
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY
- DESC 'Class for GOsa Accounts'
+ DESC 'GOsa - Class for GOsa Accounts'
OBSOLETE
MUST ( )
MAY (
@@ -117,26 +120,29 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY
) )
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate' SUP top AUXILIARY
- DESC 'Class for GOsa User Templates'
+ DESC 'GOsa - Class for GOsa User Templates'
OBSOLETE
MUST ( cn ))
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.12 NAME 'gosaGroupOfNames'
- DESC 'GOsa object grouping'
+ DESC 'GOsa - Adds the gosaGroupObjects field to groupOfNames'
SUP top AUXILIARY
MUST ( cn $ gosaGroupObjects ) MAY ( member $ description ) )
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.17 NAME 'gosaRole'
- DESC 'ACL container to define roles' SUP top STRUCTURAL
+ DESC 'GOsa - ACL container to define ACL roles'
+ SUP top STRUCTURAL
MUST ( gosaAclTemplate $ cn )
MAY ( description ) )
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.18 NAME 'gosaAcl'
- DESC 'ACL container to define single ACLs' SUP top AUXILIARY
+ DESC 'GOsa - ACL container to define single ACLs'
+ SUP top AUXILIARY
MUST ( gosaAclEntry ))
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
+ DESC 'GOsa - Container object for undo and snapshot data'
+ SUP top STRUCTURAL
MUST ( gosaSnapshotTimestamp $ gosaSnapshotDN $ gosaSnapshotData )
MAY ( description ) )
diff --git a/include/functions.inc b/include/functions.inc
index 16309b8f8dcd7abed5e21ebf725194cbb690d168..ea4a7102799c59ac2f92a4dd46b207bbe4fa0786 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -2665,13 +2665,6 @@ function check_schema($cfg)
"MSG" => "",
"INFO" => ""); // There is currently no information specified for this schema extension.;
- /* The FusionDirectory base schema */
- $checks['gosaObject'] = $def_check;
-
- $checks['gosaObject']['SCHEMA_FILES'] = array('core-fd.schema');
- $checks['gosaObject']['CLASSES_REQUIRED'] = array('gosaObject');
- $checks['gosaObject']['IS_MUST_HAVE'] = TRUE;
-
/* FusionDirectory lock entry, used to mark currently edited objects as 'in use' */
$checks['gosaLockEntry']['SCHEMA_FILES'] = array('core-fd.schema');
$checks['gosaLockEntry']['CLASSES_REQUIRED'] = array('gosaLockEntry');
diff --git a/include/select/groupSelect/group-filter.xml b/include/select/groupSelect/group-filter.xml
index 3e84c351422e7e855acd6c725bf29ad0f307c5b6..b708d0020e3610a0abdeb9ec29f2bc4375754c37 100644
--- a/include/select/groupSelect/group-filter.xml
+++ b/include/select/groupSelect/group-filter.xml
@@ -24,7 +24,7 @@
<tag>PRIMARY</tag>
<default>true</default>
<unset></unset>
- <set>(!(objectClass=gosaObject))</set>
+ <set>(objectClass=posixGroup)</set>
</element>
<element>
diff --git a/plugins/admin/groups/group-filter.xml b/plugins/admin/groups/group-filter.xml
index b535ea5e863f1085c7cae52881fa2c0c8c1e9ba8..da3c598c4dfce1dcf57ce46bd63db985135137a1 100644
--- a/plugins/admin/groups/group-filter.xml
+++ b/plugins/admin/groups/group-filter.xml
@@ -25,7 +25,7 @@
<tag>PRIMARY</tag>
<default>true</default>
<unset></unset>
- <set>(!(objectClass=gosaObject))</set>
+ <set>(objectClass=posixGroup)</set>
</element>
<element>