From 9b2c394c2529291ab3295e5892e184c824b31220 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 23 May 2006 04:38:59 +0000 Subject: [PATCH] Add dep check to fai git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3493 594d385d-05f5-0310-b6e9-bd551577e9d8 --- include/functions.inc | 3 +-- plugins/admin/fai/class_faiManagement.inc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/functions.inc b/include/functions.inc index 45ae25876..fda4672ef 100644 --- 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 ea0871b9e..b134623f0 100644 --- 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); -- 2.30.2