From 261d4348f9a3b315ae7bb3f2902823baf36b4631 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 20 May 2010 06:54:52 +0000 Subject: [PATCH] Updated system filter -DO not exlude some machine due to a lack of macAddress settings. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18563 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../admin/systems/class_filterSYSTEMS.inc | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc index 4c67c8bcd..35e0d0138 100644 --- a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc +++ b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc @@ -39,11 +39,6 @@ class filterSYSTEMS { // Detect Workstation & templates }elseif(in_array('gotoWorkstation', $entry['objectClass'])){ - if(!isset($entry['macAddress'][0]) || $entry['macAddress'][0] == "-"){ - unset($entries[$key]); - continue; // We do not need templates anymore, we've ogroups now. - //$entries[$key]['objectClass'][] = 'FAKE_OC_WorkstationTemplate'; - } $pwd_acl = $ui->get_permissions($entry['dn'],'workstation/workgeneric','userPassword'); if(preg_match("/w/",$pwd_acl)){ $entries[$key]['objectClass'][] = 'FAKE_OC_PWD_changeAble'; @@ -51,11 +46,6 @@ class filterSYSTEMS { // Detect Terminal & templates }elseif(in_array('gotoTerminal', $entry['objectClass'])){ - if(!isset($entry['macAddress'][0]) || $entry['macAddress'][0] == "-"){ - unset($entries[$key]); - continue; // We do not need templates anymore, we've ogroups now. - //$entries[$key]['objectClass'][] = 'FAKE_OC_TerminalTemplate'; - } $pwd_acl = $ui->get_permissions($entry['dn'],'terminal/termgeneric','userPassword'); if(preg_match("/w/",$pwd_acl)){ $entries[$key]['objectClass'][] = 'FAKE_OC_PWD_changeAble'; @@ -63,11 +53,6 @@ class filterSYSTEMS { // Detect Server & templates }elseif(in_array('goServer', $entry['objectClass'])){ - if(!isset($entry['macAddress'][0]) || $entry['macAddress'][0] == "-"){ - unset($entries[$key]); - continue; // We do not need templates anymore, we've ogroups now. - //$entries[$key]['objectClass'][] = 'FAKE_OC_ServerTemplate'; - } $pwd_acl = $ui->get_permissions($entry['dn'],'server/servgeneric','userPassword'); if(preg_match("/w/",$pwd_acl)){ $entries[$key]['objectClass'][] = 'FAKE_OC_PWD_changeAble'; @@ -110,9 +95,6 @@ class filterSYSTEMS { $entries[$key]['state']= $state; $entries[$key]['count'] ++; } - - - } return($entries); } -- 2.30.2