Updated server acls

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

diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc
index 8d1c53ba076b66948d6c1baab66efcb85c659763..678ef0b7f00a5112714efafe154ad8d8809f9e74 100644 (file)
--- a/plugins/admin/groups/acl_definition.inc
+++ b/plugins/admin/groups/acl_definition.inc
@@ -139,6 +139,7 @@ $ACLD['printgeneric']=   array("cn",
                        "description");
 $ACLD['servgeneric']=   array("cn",
                        "base",
+                       "create",
                        "gotoMode",
                        "description");
 $ACLD['servdb']=   array("goKrbServer",

diff --git a/plugins/admin/groups/class_groupAcl.inc b/plugins/admin/groups/class_groupAcl.inc
index fd63247e5012915ebed343ea4ce8fe951d35bc3a..25799507bbad8184b12eed8fb59d382b3b055d1c 100644 (file)
--- a/plugins/admin/groups/class_groupAcl.inc
+++ b/plugins/admin/groups/class_groupAcl.inc
@@ -162,7 +162,8 @@ class acl extends plugin
                $this->selfflag= FALSE;
        }
 
-       /* Strip trailing colon... */
+       /* Remove double colons, strip trailing colon... */
+       $this->current_acl= preg_replace("/,,/", ",", $this->current_acl);
        $this->current_acl= preg_replace("/,$/", "", $this->current_acl);
   }
 

diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc
index d9e946a14cbf8b60c4fe7c1fcf8a35114b8371e4..d84794ebd4b042262fc88884c1436e5e8070a22a 100644 (file)
--- a/plugins/admin/systems/class_servGeneric.inc
+++ b/plugins/admin/systems/class_servGeneric.inc
@@ -226,7 +226,7 @@ class servgeneric extends plugin
 
     $ui= get_userinfo();
     $acl= get_permissions ($this->dn, $ui->subtreeACL);
-    $acl= get_module_permission($acl, "server", $this->dn);
+    $acl= get_module_permission($acl, "servgeneric", $this->dn);
     if (chkacl($acl, "create") != ""){
       $message[]= _("You have no permissions to create a server on this 'Base'.");
     }