Add dep check to fai

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

diff --git a/include/functions.inc b/include/functions.inc
index 45ae25876fe246c7a5ac71d15d24ce69ff5a50a5..fda4672ef5937a3495d71aaf474856750fb53c9f 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1982,8 +1982,7 @@ function is_department_name_reserved($name,$base)
   $reservedName = array("systems","apps","incomming","internal","accounts","fax","addressbook",
                           preg_replace("/ou=(.*),/","\\1",get_people_ou()),
                           preg_replace("/ou=(.*),/","\\1",get_groups_ou()));
-
-  $follwedNames['/ou=fai,ou=configs,ou=systems,/'] = array("fai","hooks","templates","scripts","disks","packages","variables","profiles");
+  $follwedNames['/ou=fai,ou=configs,ou=systems,/'] = array("fai","hooks","templates","scripts","disk","packages","variables","profiles");
 
   /* Check if name is one of the reserved names */
   if(in_array_ics($name,$reservedName)) {

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index ea0871b9ee1f725bd498ae2236b6cd38ff854f51..b134623f088450d70d8a42dc6fe6c2309c3ba2c4 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -706,7 +706,7 @@ class faiManagement extends plugin
       return(false);
     }elseif(empty($name)){
       return(false);
-    }elseif(in_array($name,array("fai","disk","packages","scripts","templates","hooks","variables","profiles","apps"))){
+    }elseif(is_department_name_reserved($name,$base)){
       return(false);
     }
     return(true);