diff --git a/include/select/objectSelect/class_objectSelect.inc b/include/select/objectSelect/class_objectSelect.inc index f914b1cf7be56e797c86ce3569399b571f1c694c..792199c7f0ea0244420a3c93a6b59aa945b1cb59 100644 --- a/include/select/objectSelect/class_objectSelect.inc +++ b/include/select/objectSelect/class_objectSelect.inc @@ -23,7 +23,7 @@ class objectSelect extends userSelect { protected $objectTypes = array( 'user', 'application', 'terminal', 'workstation', - 'winstation', 'server', 'printer', 'phone' + 'winstation', 'server', 'printer', 'phone', 'simpleSecurityObject' ); protected $autoFilterAttributes = array('dn', 'cn', 'uid', 'description'); } diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc index aa885b7a54d877d28a6aaf5019da03ed827cc4e2..4e50e1951ae17d811fb85af61f170be314ac3be5 100644 --- a/plugins/admin/groups/class_groupManagement.inc +++ b/plugins/admin/groups/class_groupManagement.inc @@ -139,6 +139,9 @@ class groupManagement extends simpleManagement if (class_available('sambaAccount')) { $filters[]= array('id' => 'SAMBA', 'label' => _('Show samba groups')); } + if (class_available('simpleSecurityObject')) { + $filters[]= array('id' => 'SIMPLESECURITYOBJECT', 'label' => _('Show DSA entries')); + } if (class_available('systemManagement')) { $filters = array_merge( $filters, diff --git a/plugins/admin/groups/class_ogroup.inc b/plugins/admin/groups/class_ogroup.inc index 9b48d483e63e962ba812f470394821b515e3f428..ae4e57c5442a29f4ae4c0867f052c1d1578e50cc 100644 --- a/plugins/admin/groups/class_ogroup.inc +++ b/plugins/admin/groups/class_ogroup.inc @@ -146,7 +146,8 @@ class ogroup extends simplePlugin 'O' => 'winstation', 'T' => 'terminal', 'F' => 'phone', - 'P' => 'printer' + 'P' => 'printer', + 'D' => 'simpleSecurityObject', ); static function plInfo() diff --git a/plugins/admin/groups/group-filter.xml b/plugins/admin/groups/group-filter.xml index 007abeaa1dec8e71b1df65c6fa411c62861d9ece..44b95fff7bf8cda820170600de340882111c01ce 100644 --- a/plugins/admin/groups/group-filter.xml +++ b/plugins/admin/groups/group-filter.xml @@ -10,7 +10,7 @@ <search> <query> <backend>LDAP</backend> - <filter>(&(|(&(objectClass=posixGroup)(|$PRIMARY$MAIL$SAMBA))$ROLE(&(objectClass=groupOfNames)(|(gosaGroupObjects=[])$USER$GROUP$APPLICATION$SERVER$WORKSTATION$WINDOWS$TERMINAL$PRINTER$PHONE$UNKNOWN)))$NAME)</filter> + <filter>(&(|(&(objectClass=posixGroup)(|$PRIMARY$MAIL$SAMBA))$ROLE(&(objectClass=groupOfNames)(|(gosaGroupObjects=[])$USER$GROUP$APPLICATION$SERVER$WORKSTATION$WINDOWS$TERMINAL$PRINTER$PHONE$SIMPLESECURITYOBJECT$UNKNOWN)))$NAME)</filter> <attribute>dn</attribute> <attribute>objectClass</attribute> <attribute>cn</attribute> @@ -124,6 +124,14 @@ <set>(gosaGroupObjects=*F*)</set> </element> + <element> + <type>checkbox</type> + <tag>SIMPLESECURITYOBJECT</tag> + <default>true</default> + <unset></unset> + <set>(gosaGroupObjects=*D*)</set> + </element> + <element> <type>checkbox</type> <tag>UNKNOWN</tag>