From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 2 Dec 2008 15:02:07 +0000 (+0000)
Subject: Updated class user, do not set password for templates.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=626151c9a9b6c42bd6fda8ddcd4c93b77676d0b0;p=gosa.git

Updated class user, do not set password for templates.


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

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index e23798d50..adb14ec18 100644
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -1057,6 +1057,7 @@ class user extends plugin
       foreach($temp as $id => $data){
         if(isset($data['name']) && $data['name'] == $this->pw_storage){
           $tmp = new  $temp[$this->pw_storage]($this->config,$this->dn);
+          $tmp->set_hash($this->pw_storage);
           $this->attrs['userPassword'] = $tmp->create_template_hash($this->attrs);
           break;
         }
@@ -1289,7 +1290,7 @@ class user extends plugin
     if(in_array("pw_storage",$this->multi_boxes)){
       return(TRUE);
     }
-    return($this->pw_storage != $this->last_pw_storage);
+    return($this->pw_storage != $this->last_pw_storage && !$this->is_template);
   }