The default password hash wasn't read from the correct place

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

diff --git a/gosa-core/html/password.php b/gosa-core/html/password.php
index cce461f4a2d14402fbb463310318864c1b1924d9..ac8715d607e3d2752379febd46b20a954873a9e5 100644 (file)
--- a/gosa-core/html/password.php
+++ b/gosa-core/html/password.php
@@ -171,7 +171,7 @@ if ($config->get_cfg_value("forcessl") == 'true' && $ssl != '') {
 }
 
 /* Check for selected password method */
-$method= $config->get_cfg_value("hash", "crypt/md5");
+$method= $config->get_cfg_value("passwordDefaultHash", "crypt/md5");
 if (isset($_GET['method'])) {
     $method= validate($_GET['method']);
     $tmp = new passwordMethod($config);

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index a6c50550fec7430533b6b9862746343f20455fd7..fb3b1b04f91d259e9d63c04423cefc69471d604f 100644 (file)
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -600,7 +600,7 @@ class user extends plugin
 
     /* Prepare password hashes */
     if ($this->pw_storage == ""){
-      $this->pw_storage= $this->config->get_cfg_value("hash");
+      $this->pw_storage= $this->config->get_cfg_value("passwordDefaultHash");
     }
 
     $temp= passwordMethod::get_available_methods();