From adf9bc7773475e26e8dc5f7897a85b978e4e5bbb Mon Sep 17 00:00:00 2001 From: psc Date: Mon, 30 May 2011 14:48:08 +0000 Subject: [PATCH] Apply fix for #6888 When querying gosa for install jobs, test weither there is already a mac defined for our workstation. Otherwise we end up checking against all currently running installations. git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@20902 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../goto/admin/systems/goto/class_workstationGeneric.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc index 7d516ab70..953f106c3 100644 --- a/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc +++ b/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc @@ -91,7 +91,10 @@ class workgeneric extends plugin if(class_available("gosaSupportDaemon") && class_available("DaemonEvent")){ $o = new gosaSupportDaemon(); $e_types = DaemonEvent::get_event_types(USER_EVENT | SYSTEM_EVENT | HIDDEN_EVENT); - $evts = $o->get_entries_by_mac(array($this->netConfigDNS->macAddress)); + $evts = array(); + if (tests::is_mac($this->netConfigDNS->macAddress)) { + $evts = $o->get_entries_by_mac(array($this->netConfigDNS->macAddress)); + } foreach($evts as $evt){ if(isset($e_types['QUEUED'][$evt['HEADERTAG']]) && $evt['STATUS'] == "processing" && $e_types['QUEUED'][$evt['HEADERTAG']] == "DaemonEvent_reinstall"){ -- 2.30.2