From 3d7ccd2a6df5506c5ab1ae2e862cc4cbd15dd654 Mon Sep 17 00:00:00 2001 From: psc Date: Thu, 18 Jun 2009 09:51:15 +0000 Subject: [PATCH] Accept same share-/server-combination if gosaUnitTag is different (Trac: #500) git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13728 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../goto/admin/systems/services/nfs/class_servNfs.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/trunk/gosa-plugins/goto/admin/systems/services/nfs/class_servNfs.inc b/trunk/gosa-plugins/goto/admin/systems/services/nfs/class_servNfs.inc index 3de43eddc..4e4f7238e 100644 --- a/trunk/gosa-plugins/goto/admin/systems/services/nfs/class_servNfs.inc +++ b/trunk/gosa-plugins/goto/admin/systems/services/nfs/class_servNfs.inc @@ -235,8 +235,11 @@ class servnfs extends plugin $tmp = split("\|",$entry); if($tmp[0] == $this->name && $test['cn'][0] == $this_cn){ /* The selected share name is identical to another share name. Furthermore, that other share is - on a server with the same name. Reject this. - $message[]= sprintf(_("The share '%s' on another server '%s' already exists."), $this->name, $this_cn); + on a server with the same name. Reject this unless the other server is in a different + adminstrative domain. */ + if (!isset($test['gosaUnitTag']) || $test['gosaUnitTag'][0] == $this->gosaUnitTag){ + $message[]= sprintf(_("The share '%s' on another server '%s' already exists."), $this->name, $this_cn); + } } } } -- 2.30.2