From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 11 Sep 2008 10:08:54 +0000 (+0000)
Subject: Skip sending DaemonEvent_goto_reload, if the workstation comes from the incoming ou
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=70f8611c4b08902878000f39b93810161c4c57f3;p=gosa.git

Skip sending DaemonEvent_goto_reload, if the workstation comes from the incoming ou


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12419 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
index d9580d3b9..fe3d0e5b3 100644
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
@@ -466,6 +466,7 @@ class workservice extends plugin
            */
           $p = $this->parent->by_object['ogroup'];
           foreach($p->memberList as $dn => $obj){
+            if(preg_match("/".normalizePreg(get_ou("incomingou"))."/",$dn)) continue;
             if(isset($p->objcache[$dn]['macAddress']) && !empty($p->objcache[$dn]['macAddress'])){
               $macs[] = $p->objcache[$dn]['macAddress'];
             }
@@ -475,7 +476,7 @@ class workservice extends plugin
           /* We are a workstation. Add current mac.
            */
           $mac = $this->parent->by_object['workgeneric']->netConfigDNS->macAddress;
-          if(!empty($mac)){
+          if(!empty($mac) && !preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->orig_dn)){
             $macs[] = $mac;
           }          
         }