From: psc <psc@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 16 Jul 2009 13:18:43 +0000 (+0000)
Subject: Take share server into account, when testing weither
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;ds=sidebyside;h=df605fdbe8ab09a9e4ce560def28e30de4081357;p=gosa.git

Take share server into account, when testing weither
a specific share is in use or not, because otherwise
we might block removing in case of double sharenames on
different servers.



git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13933 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/trunk/gosa-plugins/goto/admin/systems/services/shares/class_goShareServer.inc b/trunk/gosa-plugins/goto/admin/systems/services/shares/class_goShareServer.inc
index f4ad3050f..c85f79c93 100644
--- a/trunk/gosa-plugins/goto/admin/systems/services/shares/class_goShareServer.inc
+++ b/trunk/gosa-plugins/goto/admin/systems/services/shares/class_goShareServer.inc
@@ -248,7 +248,8 @@ class goShareServer extends goService{
     /* Check if the share is used by someone */
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->config->current['BASE']);
-    $ldap->search("(|(gotoProfileServer=*|$id)(gotoShare=*|$id|*))", array("cn"));
+    $cn = $ldap->getCn($this->dn);
+    $ldap->search("(|(gotoProfileServer=*|$id)(gotoShare=$cn|$id|*))", array("cn"));
     if ($ldap->count() != 0){
       while ($attrs= $ldap->fetch()){
         $obj[$ldap->getDN()]= $attrs['cn'][0];