Code

Take share server into account, when testing weither
authorpsc <psc@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 16 Jul 2009 13:18:43 +0000 (13:18 +0000)
committerpsc <psc@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 16 Jul 2009 13:18:43 +0000 (13:18 +0000)
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

trunk/gosa-plugins/goto/admin/systems/services/shares/class_goShareServer.inc

index f4ad3050f6fb15bed17658aa0bd0cc3c4a7dff5b..c85f79c9321f31f2d02b7feadc7f8fbf3964bce2 100644 (file)
@@ -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];