From 8b9b5e5fff5870e31761bfa4af41f9e112063d58 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 27 Oct 2008 07:56:34 +0000
Subject: [PATCH] Updated userPassword permission for some systems. -the ACL
 attribute is now named "userPassword" instead of "gotoRootPasswd"

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12776 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-plugins/systems/admin/systems/class_componentGeneric.inc | 2 +-
 gosa-plugins/systems/admin/systems/class_divListSystem.inc    | 4 ++--
 gosa-plugins/systems/admin/systems/class_servGeneric.inc      | 2 +-
 gosa-plugins/systems/admin/systems/class_systemManagement.inc | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gosa-plugins/systems/admin/systems/class_componentGeneric.inc b/gosa-plugins/systems/admin/systems/class_componentGeneric.inc
index a03b57adf..743da7e2c 100644
--- a/gosa-plugins/systems/admin/systems/class_componentGeneric.inc
+++ b/gosa-plugins/systems/admin/systems/class_componentGeneric.inc
@@ -318,7 +318,7 @@ class componentGeneric extends plugin
             "cn"                  => _("Name"),
             "base"                => _("Base"),
             "description"         => _("Description"),
-            "gotoRootPasswd"      => _("Root password"))
+            "userPassword"      => _("Root password"))
           ));
   }
 
diff --git a/gosa-plugins/systems/admin/systems/class_divListSystem.inc b/gosa-plugins/systems/admin/systems/class_divListSystem.inc
index 68f4fd26e..a68c74497 100644
--- a/gosa-plugins/systems/admin/systems/class_divListSystem.inc
+++ b/gosa-plugins/systems/admin/systems/class_divListSystem.inc
@@ -343,9 +343,9 @@ class divListSystem extends MultiSelectWindow
         $display= $val["cn"][0].$dsc;
       }
 
-      /* Check if this is a terminal/workstation && if we are allowed to change the gotoRootPasswd */
+      /* Check if this is a terminal/workstation && if we are allowed to change the userPassword */
       $display_key_for = array("terminal","workstation","server","component");
-      $pwd_acl = $ui->get_permissions($val['dn'],$tabs[$type]['ACL'],"gotoRootPasswd");
+      $pwd_acl = $ui->get_permissions($val['dn'],$tabs[$type]['ACL'],"userPassword");
       if(preg_match("/w/",$pwd_acl) && in_array($type,$display_key_for)){
         $action2 = "<input class='center' type='image' src='images/lists/key.png' alt='"._("Password")."'   name='system_setpwd_%KEY%' title='"._("Set password")."'>";
       }else{
diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
index 0cd22e239..664f024c7 100644
--- a/gosa-plugins/systems/admin/systems/class_servGeneric.inc
+++ b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
@@ -514,7 +514,7 @@ class servgeneric extends plugin
             "base"          => _("Base"),
 
             "gotoMode"      => _("Goto mode"),
-            "gotoRootPasswd"=> _("Root password"),
+            "userPassword"=> _("Root password"),
             "FAIstate"      => _("Action flag"))
           ));
   }
diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index d4b6dc800..f2c37eecf 100644
--- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc
+++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
@@ -587,7 +587,7 @@ class systems extends plugin
       $acl      = $tabs[$type]["ACL"];
       $tabclass = $tabs[$type]["TABCLASS"];
       $ui       = get_userinfo();
-      $tabacl   = $ui->get_permissions($dn,$acl,"gotoRootPasswd");
+      $tabacl   = $ui->get_permissions($dn,$acl,"userPassword");
       if(preg_match("/w/",$tabacl)){
         $this->dn= $this->terminals[$s_entry]['dn'];
         session::set('objectinfo',$this->dn);
@@ -640,7 +640,7 @@ class systems extends plugin
    
         /* Get acls */
         $ui       = get_userinfo();
-        $tabacl   = $ui->get_permissions($this->dn,$acl,"gotoRootPasswd");
+        $tabacl   = $ui->get_permissions($this->dn,$acl,"userPassword");
 
         /* Check acls */
         if(preg_match("/w/",$tabacl)){
-- 
2.30.2