From c1adb94270c99469f56ae31f1f3c0c3a85571583 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 19 May 2010 14:59:53 +0000 Subject: [PATCH] Updated setup -Fixed ACL set for the admin account git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18558 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/setup/class_setupStep_Migrate.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc index fa0abbc86..4b888535f 100644 --- a/gosa-core/setup/class_setupStep_Migrate.inc +++ b/gosa-core/setup/class_setupStep_Migrate.inc @@ -222,13 +222,13 @@ class Step_Migrate extends setup_step foreach($members as $member){ $member = base64_decode($member); if(isset($users[$member])){ - if(preg_match("/all;cmdrw/i",$tmp[3])){ + if(preg_match("/all\/all;cmdrw/i",$tmp[3])){ $valid_users .= $users[$member].", "; $GOsa_26_found = TRUE; } } if(isset($groups[$member])){ - if(preg_match("/all;cmdrw/i",$tmp[3])){ + if(preg_match("/all\/all;cmdrw/i",$tmp[3])){ $ldap->cat($member); $group_attrs = $ldap->fetch(); $val_users = ""; @@ -257,7 +257,7 @@ class Step_Migrate extends setup_step for($e = 0 ; $e < $cnt ; $e++){ $a_str = $ret['gosaAclTemplate'][$e]; - if(preg_match("/^[0-9]*:psub:/",$a_str) && preg_match("/:all;cmdrw$/",$a_str)){ + if(preg_match("/^[0-9]*:psub:/",$a_str) && preg_match("/:all\/all;cmdrw$/",$a_str)){ $members = explode(",",$tmp[3]); foreach($members as $member){ @@ -388,7 +388,7 @@ class Step_Migrate extends setup_step } } - $acl = "0:psub:".base64_encode($dn).":all;cmdrw"; + $acl = "0:psub:".base64_encode($dn).":all/all;cmdrw"; $attrs_new['gosaAclEntry'][] = $acl; if(isset($attrs['gosaAclEntry'])){ for($i = 0 ; $i < $attrs['gosaAclEntry']['count']; $i ++){ -- 2.30.2