From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 1 Dec 2006 12:01:34 +0000 (+0000)
Subject: Updated server acls
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=228375cd08d678cf86cc9dd78e555e8577f0ce88;p=gosa.git

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 8d1c53ba0..678ef0b7f 100644
--- 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 fd63247e5..25799507b 100644
--- 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 d9e946a14..d84794ebd 100644
--- 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'.");
     }