From f15a6986cab9c4f511b0cb5cc5b40995d2be3ce4 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 29 Apr 2010 14:13:14 +0000 Subject: [PATCH] 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 --- gosa-core/html/password.php | 2 +- gosa-core/plugins/personal/generic/class_user.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gosa-core/html/password.php b/gosa-core/html/password.php index cce461f4a..ac8715d60 100644 --- 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 a6c50550f..fb3b1b04f 100644 --- 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(); -- 2.30.2